Skip to content

fix: skip pre-commit hooks when merging a branch to a PR WIP DO NOT MERGE - #244

Open
ian-leggett wants to merge 14 commits into
mainfrom
fix/csf-21-skip-pre-commit-on-merge-pr
Open

fix: skip pre-commit hooks when merging a branch to a PR WIP DO NOT MERGE#244
ian-leggett wants to merge 14 commits into
mainfrom
fix/csf-21-skip-pre-commit-on-merge-pr

Conversation

@ian-leggett

Copy link
Copy Markdown
Contributor

Signed-off-by: DBT pre-commit check

Description

Please include a summary of the changes and the related issue including relevant motivation and context. Please also include a link to the corresponding JIRA ticket this merge request addresses.

Contributors

Let's acknowledge the people who contributed to the work.

Type of change

  • Refactoring (made code better without changing its behaviour)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

How this has been tested

Please describe the tests that you ran to verify your changes.

If they are not automated tests please explain why and provide screenshots and/or instructions so they can reproduced.

Checklist

  • I have performed a self-review of my code
  • I have commented my code in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings

Reviewer Checklist

  • I have reviewed the PR and ensured no secret values are present

@ian-leggett
ian-leggett requested a review from a team as a code owner August 26, 2026 10:52
@github-actions

Copy link
Copy Markdown

Dependency Review

✅ No vulnerabilities or OpenSSF Scorecard issues found.

Scanned Files

None

@ian-leggett
ian-leggett force-pushed the fix/csf-21-skip-pre-commit-on-merge-pr branch 6 times, most recently from 89aceba to 1257352 Compare August 26, 2026 14:10
@ian-leggett
ian-leggett changed the base branch from main to wip/main August 26, 2026 14:12
@ian-leggett
ian-leggett force-pushed the fix/csf-21-skip-pre-commit-on-merge-pr branch from 1257352 to 9517f12 Compare August 26, 2026 14:15
@ian-leggett
ian-leggett changed the base branch from wip/main to main August 26, 2026 14:21
@ian-leggett
ian-leggett changed the base branch from main to wip/main August 26, 2026 14:21
@ian-leggett
ian-leggett changed the base branch from wip/main to main August 26, 2026 14:22
@ian-leggett
ian-leggett changed the base branch from main to wip/main August 26, 2026 14:23
@ian-leggett
ian-leggett force-pushed the fix/csf-21-skip-pre-commit-on-merge-pr branch 3 times, most recently from 80e2081 to 693b146 Compare August 26, 2026 14:28
@ian-leggett
ian-leggett changed the base branch from wip/main to main August 26, 2026 14:29
@ian-leggett
ian-leggett force-pushed the fix/csf-21-skip-pre-commit-on-merge-pr branch from e2a4a6b to c3299f7 Compare August 27, 2026 09:53
Signed-off-by: DBT pre-commit check
@ian-leggett
ian-leggett force-pushed the fix/csf-21-skip-pre-commit-on-merge-pr branch from df98a16 to f62ef9e Compare August 27, 2026 14:57
@SamW94 SamW94 closed this Aug 27, 2026
@SamW94 SamW94 reopened this Aug 27, 2026
@SamW94 SamW94 closed this Aug 27, 2026
@SamW94 SamW94 reopened this Aug 27, 2026
SamW94 added 4 commits August 27, 2026 16:10
Signed-off-by: DBT pre-commit check
Signed-off-by: DBT pre-commit check
Signed-off-by: DBT pre-commit check
Signed-off-by: DBT pre-commit check
SamW94 added 8 commits August 27, 2026 16:21
Signed-off-by: DBT pre-commit check
Signed-off-by: DBT pre-commit check
Signed-off-by: DBT pre-commit check
Signed-off-by: DBT pre-commit check
Signed-off-by: DBT pre-commit check
Signed-off-by: DBT pre-commit check
@github-actions

Copy link
Copy Markdown

Your PR has commits that are missing the Signed-off-by trailer. This is likely due to the pre-commit hook not being configured on your local machine. The usual fix for this issue is to run pre-commit install --install-hooks --overwrite -t commit-msg -t pre-commit, however for more detailed help in setting up the pre-commit hooks, follow the instructions at https://github.com/uktrade/github-standards/blob/main/README.md#usage

fi
echo "We need to check this for the trailers"
git log ${{ github.event.pull_request.head.sha }} --format=%B -1 | git interpret-trailers --parse | grep '${{ env.SIGNED_OFF_MESSAGE }}'
git checkout ${{ github.event.pull_request.head.ref }}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants