forked from storj/drpc
-
Notifications
You must be signed in to change notification settings - Fork 6
ci: add merge guard workflow for fixup commits and do-not-merge label #53
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: Check Do Not Merge | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| types: [opened, reopened, labeled, unlabeled] | ||
|
|
||
| jobs: | ||
|
|
||
| check-do-not-merge: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Block merge if do-not-merge label is present | ||
| env: | ||
| HAS_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'do-not-merge') }} | ||
| run: | | ||
| if [ "$HAS_LABEL" = "true" ]; then | ||
| echo "::error::PR has the 'do-not-merge' label. Remove it before merging." | ||
| exit 1 | ||
| fi |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: Check Fixup Commits | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
|
|
||
| check-fixup-commits: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Check for fixup or squash commits | ||
| run: | | ||
| git fetch origin ${{ github.base_ref }} | ||
| COMMITS=$(git log --oneline "origin/${{ github.base_ref }}..HEAD" --grep="^fixup!" --grep="^squash!" --format="%h %s") | ||
| if [ -n "$COMMITS" ]; then | ||
| echo "::error::PR contains fixup/squash commits that must be squashed before merging:" | ||
| echo "$COMMITS" | ||
| exit 1 | ||
| fi | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: do we need to check for 'squash!' in the commit message? (I don't see it being used). We can skip if it is not the convention.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's fine to keep a
squash!check too.