diff options
| author | Erik Johnston <erikj@element.io> | 2024-01-10 13:53:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-10 13:53:44 +0000 |
| commit | 72e9b74bbfa7086e47f05271e5a2f86ad8408370 (patch) | |
| tree | e0947a496bfd9b72bf48eef15aa564cb0ac72c0f | |
| parent | Remove CI check for sign off (#16776) (diff) | |
| download | synapse-72e9b74bbfa7086e47f05271e5a2f86ad8408370.tar.xz | |
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.
| -rw-r--r-- | .github/workflows/tests.yml | 19 | ||||
| -rw-r--r-- | changelog.d/16781.misc | 1 |
2 files changed, 19 insertions, 1 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 024d18bd0f..7ce22befce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 diff --git a/changelog.d/16781.misc b/changelog.d/16781.misc new file mode 100644 index 0000000000..2f628dc5cb --- /dev/null +++ b/changelog.d/16781.misc @@ -0,0 +1 @@ +Ensure CI fails when linting fails to make sure auto-merge does the correct thing. |