-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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.
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
ci: use base and head SHAs from context in lint-build-commits workflow #32140
Merged
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
tklauser
added
area/CI
Continuous Integration testing issue or flake
release-note/ci
This PR makes changes to the CI.
labels
Apr 23, 2024
tklauser
force-pushed
the
pr/tklauser/build-commits-no-rebase
branch
2 times, most recently
from
April 23, 2024 13:49
ae7643e
to
f1773f2
Compare
tklauser
changed the title
ci: use base and head SHAs provided by workflow context
ci: use base and head SHAs from context in lint-build-commits workflow
Apr 23, 2024
tklauser
force-pushed
the
pr/tklauser/build-commits-no-rebase
branch
from
April 23, 2024 13:51
f1773f2
to
b238aaf
Compare
Testing PR here: #32143 |
tklauser
force-pushed
the
pr/tklauser/build-commits-no-rebase
branch
3 times, most recently
from
April 24, 2024 09:00
22a909b
to
222c303
Compare
Instead of querying the GitHub API for the parent SHA, use the base and head SHA provided by the github.event.pull_request context. This works fine because the workflow only runs on pull requests. Also use a loop and git checkout instead of git rebase to avoid potential issues with merge conflicts in the presence of merge commits in the PR. Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser
force-pushed
the
pr/tklauser/build-commits-no-rebase
branch
from
April 30, 2024 09:20
222c303
to
9496da4
Compare
Example of a failing run: https://github.com/cilium/cilium/actions/runs/8892417966/job/24416427312?pr=32143 Example of a passing run: https://github.com/cilium/cilium/actions/runs/8892565244/job/24416905970?pr=32143 Marking ready for review. |
/test |
tklauser
added
needs-backport/1.13
This PR / issue needs backporting to the v1.13 branch
needs-backport/1.14
This PR / issue needs backporting to the v1.14 branch
needs-backport/1.15
This PR / issue needs backporting to the v1.15 branch
labels
Apr 30, 2024
aanm
approved these changes
Apr 30, 2024
tklauser
added
the
backport/author
The backport will be carried out by the author of the PR.
label
May 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area/CI
Continuous Integration testing issue or flake
backport/author
The backport will be carried out by the author of the PR.
needs-backport/1.13
This PR / issue needs backporting to the v1.13 branch
needs-backport/1.14
This PR / issue needs backporting to the v1.14 branch
needs-backport/1.15
This PR / issue needs backporting to the v1.15 branch
release-note/ci
This PR makes changes to the CI.
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.
Instead of querying the GitHub API for the parent SHA, use the base and head SHA provided by the github.event.pull_request context. This works fine because the workflow only runs on pull requests.
Also use a loop and git checkout instead of git rebase to avoid potential issues with merge conflicts in the presence of merge commits in the PR.