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.

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

Check that dependencies don't include unmerged commits #3237

Merged
merged 3 commits into from
Nov 14, 2024

Conversation

skitt
Copy link
Member

@skitt skitt commented Sep 30, 2024

This ensures that the project doesn't end up depending on commits that aren't present in the corresponding branch of the dependency. This is useful to prevent merging with pre-rebase commits from cross-project changes; it also ensures that malicious commits from forks can't end up references in the main projects.

Depends on submariner-io/shipyard#1739

@submariner-bot
Copy link
Contributor

🤖 Created branch: z_pr3237/skitt/dummy-change
🚀 Full E2E won't run until the "ready-to-test" label is applied. I will add it automatically once the PR has 2 approvals, or you can add it manually.

Copy link

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further
activity occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale label Oct 15, 2024
@dfarrell07
Copy link
Member

I see the submariner-io/shipyard#1730 PR is merged. What's the plan for other repos?

@dfarrell07 dfarrell07 removed the stale label Oct 15, 2024
@skitt
Copy link
Member Author

skitt commented Oct 15, 2024

I see the submariner-io/shipyard#1730 PR is merged. What's the plan for other repos?

I’m updating this PR to use the merged script; once that’s done I’ll replicate the PR on the other repos.

@skitt skitt force-pushed the dummy-change branch 2 times, most recently from d3a1ca0 to 71724bd Compare October 15, 2024 17:17
@skitt skitt marked this pull request as ready for review October 15, 2024 17:17
@tpantelis
Copy link
Contributor

Looks like it worked!

@skitt
Copy link
Member Author

skitt commented Oct 15, 2024

This ensures that the project doesn't end up depending on commits that
aren't present in the corresponding branch of the dependency. This is
useful to prevent merging with pre-rebase commits from cross-project
changes; it also ensures that malicious commits from forks can't end
up references in the main projects.

Signed-off-by: Stephen Kitt <[email protected]>
Copy link

This PR/issue depends on:

Copy link

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further
activity occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale label Nov 14, 2024
@submariner-bot submariner-bot added the ready-to-test When a PR is ready for full E2E testing label Nov 14, 2024
@tpantelis tpantelis enabled auto-merge (rebase) November 14, 2024 18:11
@dfarrell07
Copy link
Member

Two jobs failed, re-running.

@tpantelis tpantelis merged commit 7e87cbb into submariner-io:devel Nov 14, 2024
41 checks passed
@submariner-bot
Copy link
Contributor

🤖 Closed branches: [z_pr3237/skitt/dummy-change]

@skitt skitt deleted the dummy-change branch November 15, 2024 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-test When a PR is ready for full E2E testing stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants