Skip to content
Snippets Groups Projects
Unverified Commit 72e9b74b authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

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.
parent 8189942a
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
Ensure CI fails when linting fails to make sure auto-merge does the correct thing.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment