diff options
| author |  shtlrs <[email protected]> | 2023-08-12 23:37:01 +0200 |
|---|---|---|
| committer | shtlrs <[email protected]> | 2023-08-12 23:37:01 +0200 |
| commit | 1439618b007831a982a26f3f9410151bb85796c0 (patch) | |
| tree | 4ec04a1d9132fa727db3c0d57f125f6acad19435 | |
| parent | Merge pull request #2717 from python-discord/reuse-fixup-blocker-workflow (diff) | |
run fixup blocker when git ref isn't main
This also makes the lint-test workflow a dependency since as we'd want to run linting on all fixup commits still
| -rw-r--r-- | .github/workflows/main.yml | 8 |
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' |