Backport merged commit SHA instead of individual commits #313
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Attempts to simplify backport operations by cherry-picking the merged commit of a PR on the base branch instead of cherry-picking each individual commit from the PR.
rosstimothy
force-pushed
the
tross/backport-bot-updates
branch
from
4d35219 to
c18f958
Compare
./bot -workflow=backport -token=foo -reviewers=bar -org=gravitational -pr=51521 -repo=teleport -local=true -branch=bot/backport/v17
2025/02/03 14:48:44 Running backport.
2025/02/03 14:48:45 --> Backporting to bot/backport/v17 <--
2025/02/03 14:48:45 Running: git config --global user.name github-actions
2025/02/03 14:48:45 Running: git config --global user.email [email protected]
2025/02/03 14:48:45 Running: git fetch origin bot/backport/v17 pull/51521/head
2025/02/03 14:48:45 Running: git checkout bot/backport/v17
2025/02/03 14:48:45 Running: git checkout -b bot/backport-51521-bot/backport/v17
2025/02/03 14:48:45 Running: git cherry-pick c64253265b7cb675c7ca336c0454a65b7db4dd5d
2025/02/03 14:48:45 Running: git push origin bot/backport-51521-bot/backport/v17
2025/02/03 14:48:45 Workflow backport complete. |
zmb3
approved these changes
Feb 3, 2025
rosstimothy
added a commit
that referenced
this pull request
Feb 3, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change all backports will fail with a similar `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
This was missed in #313. Without this change backports will fail with a `fatal: bad object c64253265b7cb675c7ca336c0454a65b7db4dd5d` error.
rosstimothy
pushed a commit
that referenced
this pull request
Feb 4, 2025
This reverts commit ed99ff6.
rosstimothy
added a commit
that referenced
this pull request
Feb 4, 2025
…" (#320) This reverts commit ed99ff6. Co-authored-by: github-actions <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Attempts to simplify backport operations by cherry-picking the merged commit of a PR on the base branch instead of cherry-picking each individual commit from the PR.