summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-08-05 11:22:27 +0100
committerGitHub <noreply@github.com>2021-08-05 11:22:27 +0100
commite33f14e8d51e33cb86d7791495b73ae4c1e784f9 (patch)
tree2e80d943c23ee13e5c6aeca73015e35ee1dee8ee
parentMerge tag 'v1.40.0rc2' into develop (diff)
downloadsynapse-e33f14e8d51e33cb86d7791495b73ae4c1e784f9.tar.xz
Don't fail CI when lint-newfile job was skipped (#10529)
Diffstat (limited to '')
-rw-r--r--.github/workflows/tests.yml7
-rw-r--r--changelog.d/10529.misc1
2 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml

index 239553ae13..75c2976a25 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - + jobs: lint: runs-on: ubuntu-latest @@ -374,6 +374,11 @@ jobs: rc=0 results=$(jq -r 'to_entries[] | [.key,.value.result] | join(" ")' <<< $NEEDS_CONTEXT) while read job result ; do + # The newsfile lint may be skipped on non PR builds + if [ $result == "skipped" ] && [ $job == "lint-newsfile" ]; then + continue + fi + if [ "$result" != "success" ]; then echo "::set-failed ::Job $job returned $result" rc=1 diff --git a/changelog.d/10529.misc b/changelog.d/10529.misc new file mode 100644
index 0000000000..4caf22523c --- /dev/null +++ b/changelog.d/10529.misc
@@ -0,0 +1 @@ +Fix CI to not break when run against branches rather than pull requests.