aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar jchristgit <[email protected]>2023-08-16 11:38:38 +0200
committerGravatar GitHub <[email protected]>2023-08-16 11:38:38 +0200
commiteedd3af9b215984e28ee3870eb1139df90e35a6f (patch)
treefb8b6a97b2788e6919c8b1fcb078b588a5047ac1
parentBump coverage from 7.2.7 to 7.3.0 (#2720) (diff)
parentrun fixup blocker when git ref isn't main (diff)
Merge pull request #2718 from python-discord/run-fixup-blocker-on-pr-only
Run fixup blocker only when the ref isn't main's HEAD
-rw-r--r--.github/workflows/main.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 42b6295dc..f79af2659 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,12 +14,14 @@ concurrency:
jobs:
- fixup-commit-blocker:
- uses: python-discord/.github/.github/workflows/block-fixup-commits.yaml@main
-
lint-test:
uses: ./.github/workflows/lint-test.yml
+ fixup-commit-blocker:
+ if: github.ref != 'refs/heads/main'
+ uses: python-discord/.github/.github/workflows/block-fixup-commits.yaml@main
+ needs: lint-test
+
generate-sha-tag:
if: github.ref == 'refs/heads/main'