Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Testing new merge action on not forked PR #30

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Testing new merge action on not forked PR #30

wants to merge 2 commits into from

Conversation

pv72895
Copy link
Owner

@pv72895 pv72895 commented Feb 14, 2024

This PR isn't forked but is using the same action as the forked equivalent - #29

@trunk-io Trunk.io
Copy link

trunk-io bot commented Feb 14, 2024 •
edited
Loading

✨ Submitted to Merge with priority 0 by @eltonkl. It will be added to the merge queue once all branch protection rules pass, there are no merge conflicts with the target branch, and impacted targets for the current PR head commit have been uploaded. See more details here.

@trunk-dev trunk-dev
Copy link

trunk-dev bot commented Feb 14, 2024 •
edited
Loading

🚫 This pull request was requested to be cancelled by @pv72895, so it was removed from the merge queue. See more details here.

  • To merge this pull request, check the box to the left or comment /trunk merge below.

@trunk-dev2 trunk-dev2
Copy link

trunk-dev2 bot commented Feb 14, 2024 •
edited
Loading

✨ Submitted to Merge with priority 0 by @eltonkl. It will be added to the merge queue once all branch protection rules pass and there are no merge conflicts with the target branch. See more details here.

@trunk-staging-io Trunk-Staging.io
Copy link

trunk-staging-io bot commented Feb 14, 2024 •
edited
Loading

✨ Submitted to Merge with priority 0 by Elton Leong (@eltonkl). It will skip to the front of the merge queue and restart any PRs below it once all branch protection rules pass and there are no merge conflicts with the target branch. See more details here.

@pv72895 pv72895 mentioned this pull request Feb 14, 2024
Merged
pv72895 added a commit to trunk-io/merge-action that referenced this pull request Feb 14, 2024
@pv72895
Handle Uploading Impacted Targets From Forked PRs (#47)
0d8da4c 
## What Does The PR Do
This PR properly handles uploading impacted targets from forked PRs.
This required some changes with how we check out branches from PRs -
mainly, switching to the SHA instead of the ref/branch name

## Testing
This was tested with two PRs using the most current SHA of this action
(`7892141d5667431db80de9b7c8fd82378c7390bd`) - one was forked, and one
was not

**Forked**
* pv72895/phil-test-repo#29
* [Successful upload of impacted
targets](https://github.com/pv72895/phil-test-repo/actions/runs/7907782805/job/21585582453?pr=29)

**Not forked**
* pv72895/phil-test-repo#30
* [Successful upload of impacted
targets](https://github.com/pv72895/phil-test-repo/actions/runs/7907814712/job/21585684986?pr=30)

## Other things done in the PR
I made it so that we also print out the response body from the API call
to upload impacted targets if we don't get a 200 back, which should make
it much clearer as to what went wrong
@pv72895
Copy link
Owner Author

pv72895 commented Mar 6, 2024

/trunk merge -p1

@pv72895
Copy link
Owner Author

pv72895 commented Mar 6, 2024

/trunk cancel

@pv72895
Copy link
Owner Author

pv72895 commented Mar 12, 2024

/trunk merge

1 similar comment
@pv72895
Copy link
Owner Author

pv72895 commented Mar 12, 2024

/trunk merge

@pv72895
Copy link
Owner Author

pv72895 commented Mar 12, 2024

/trunk cancel

1 similar comment
@pv72895
Copy link
Owner Author

pv72895 commented Mar 12, 2024

/trunk cancel

@pv72895
Copy link
Owner Author

pv72895 commented Mar 14, 2024

#27

@pv72895
Copy link
Owner Author

pv72895 commented Mar 14, 2024

#23

@pv72895
Copy link
Owner Author

pv72895 commented Mar 21, 2024

/trunk merge --priority=high

@trunk-io Trunk.io
Copy link

trunk-io bot commented Mar 21, 2024

/trunk merge --priority=high

An error occurred while handling your Trunk command: Priority must be between 0 and 255 (0 is highest)

1 similar comment
@trunk-dev2 trunk-dev2
Copy link

trunk-dev2 bot commented Mar 21, 2024

/trunk merge --priority=high

An error occurred while handling your Trunk command: Priority must be between 0 and 255 (0 is highest)

@pv72895
Copy link
Owner Author

pv72895 commented Mar 21, 2024

/trunk cancel

@pv72895
Copy link
Owner Author

pv72895 commented Mar 25, 2024

/trunk merge

@pv72895
Copy link
Owner Author

pv72895 commented Mar 25, 2024

/trunk cancel

@eltonkl
Copy link

eltonkl commented Mar 25, 2024

/trunk merge -p0

@trunk-dev trunk-dev
Copy link

trunk-dev bot commented Mar 25, 2024

An error occurred while submitting your PR to the queue: Only users that are a part of this repo's Trunk organization or have write permissions to the repo can submit a PR to the queue

1 similar comment
@trunk-dev trunk-dev
Copy link

trunk-dev bot commented Mar 25, 2024

An error occurred while submitting your PR to the queue: Only users that are a part of this repo's Trunk organization or have write permissions to the repo can submit a PR to the queue

@eltonkl
Copy link

eltonkl commented Mar 25, 2024

/trunk merge -p0

@trunk-dev trunk-dev
Copy link

trunk-dev bot commented Mar 25, 2024

An error occurred while submitting your PR to the queue: Only users that are a part of this repo's Trunk organization or have write permissions to the repo can submit a PR to the queue

1 similar comment
@trunk-dev trunk-dev
Copy link

trunk-dev bot commented Mar 25, 2024

An error occurred while submitting your PR to the queue: Only users that are a part of this repo's Trunk organization or have write permissions to the repo can submit a PR to the queue

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pv72895 @eltonkl