Check unmerged commits in dependencies #1730
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
skitt
requested review from
mkolesnik,
Oats87,
sridhargaddam,
tpantelis and
vthapar
as code owners
|
🤖 Created branch: z_pr1730/skitt/check-dependency-branches |
tpantelis
approved these changes
Sep 30, 2024
skitt
force-pushed
the
check-dependency-branches
branch
2 times, most recently
from
7545109 to
e75773c
Compare
dfarrell07
reviewed
Oct 7, 2024
| # vX.Y.Z-0.YYYYMMDDhhmmss-hash | ||
| GOWORK=off go list -m -mod=mod -json all | \ | ||
| jq -r 'select(.Path | contains("/submariner-io/")) | select(.Main != true) | select(.Version | contains ("-")) | select(.Version | length > 14) | "\(.Path) \(.Version)"' | \ | ||
| while read -r project version; do |
There was a problem hiding this comment.
Nit: Should there be indentation inside this loop?
Which highlights that shellcheck doesn't do format checking. They recommend shfmt. I can look into it if other people think it would be helpful.
There was a problem hiding this comment.
There should indeed, thanks! shfmt could be useful; our indentation in particular is inconsistent, running shfmt -i 4 would fix that.
skitt
force-pushed
the
check-dependency-branches
branch
3 times, most recently
from
7dde182 to
6c3b557
Compare
This adds a script which examines submariner-io dependencies with versions referencing untagged git commits, that is to say commits which haven't been released. It ensures that any such dependencies point to a commit in the relevant branch, to avoid merging PRs with pointers to unmerged commits. Since the project rebases on PR merge, the commit hashes change, and dependent PRs can end up being merged with a reference to an in-development commit; that can break local builds. Since Shipyard doesn't have any submariner-io dependencies, this isn't integrated into CI yet; it will be used in other Submariner projects. Signed-off-by: Stephen Kitt <[email protected]>
skitt
force-pushed
the
check-dependency-branches
branch
from
6c3b557 to
fff1722
Compare
dfarrell07
approved these changes
Oct 10, 2024
|
🤖 Closed branches: [z_pr1730/skitt/check-dependency-branches] |
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.
This adds a script which examines submariner-io dependencies with versions referencing untagged git commits, that is to say commits which haven't been released. It ensures that any such dependencies point to a commit in the relevant branch, to avoid merging PRs with pointers to unmerged commits. Since the project rebases on PR merge, the commit hashes change, and dependent PRs can end up being merged with a reference to an in-development commit; that can break local builds.
Since Shipyard doesn't have any submariner-io dependencies, this isn't integrated into CI yet; it will be used in other Submariner projects.
See submariner-io/submariner-operator#3237 for a check involving this (and correctly failing).