mirror of
https://github.com/element-hq/synapse.git
synced 2024-12-14 11:57:44 +00:00
Fix auto-merge CI to correctly wait for linting. (#16781)
Otherwise if you hit the `Enable auto-merge` button and the linting fails the PR is still aut-merged.
This commit is contained in:
parent
8189942a1f
commit
72e9b74bbf
2 changed files with 19 additions and 1 deletions
19
.github/workflows/tests.yml
vendored
19
.github/workflows/tests.yml
vendored
|
@ -282,10 +282,26 @@ jobs:
|
|||
- check-schema-delta
|
||||
- check-lockfile
|
||||
- lint-clippy
|
||||
- lint-clippy-nightly
|
||||
- lint-rustfmt
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- run: "true"
|
||||
- uses: matrix-org/done-action@v2
|
||||
with:
|
||||
needs: ${{ toJSON(needs) }}
|
||||
|
||||
# Various bits are skipped if there was no applicable changes.
|
||||
skippable: |
|
||||
check-sampleconfig
|
||||
check-schema-delta
|
||||
lint
|
||||
lint-mypy
|
||||
lint-newsfile
|
||||
lint-pydantic
|
||||
lint-clippy
|
||||
lint-clippy-nightly
|
||||
lint-rustfmt
|
||||
|
||||
|
||||
calculate-test-jobs:
|
||||
if: ${{ !cancelled() && !failure() }} # Allow previous steps to be skipped, but not fail
|
||||
|
@ -695,6 +711,7 @@ jobs:
|
|||
- complement
|
||||
- cargo-test
|
||||
- cargo-bench
|
||||
- linting-done
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: matrix-org/done-action@v2
|
||||
|
|
1
changelog.d/16781.misc
Normal file
1
changelog.d/16781.misc
Normal file
|
@ -0,0 +1 @@
|
|||
Ensure CI fails when linting fails to make sure auto-merge does the correct thing.
|
Loading…
Reference in a new issue