Don't cancel try-perf branch if 'outdated'

This commit is contained in:
Ryan Levick 2022-08-01 22:52:48 +02:00 committed by Mark Rousskov
parent c9e134e1b6
commit debb75aa44
2 changed files with 4 additions and 4 deletions

View File

@ -79,7 +79,7 @@ jobs:
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with: with:
github_token: "${{ secrets.github_token }}" github_token: "${{ secrets.github_token }}"
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
- name: collect CPU statistics - name: collect CPU statistics
run: src/ci/scripts/collect-cpu-stats.sh run: src/ci/scripts/collect-cpu-stats.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
@ -478,7 +478,7 @@ jobs:
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with: with:
github_token: "${{ secrets.github_token }}" github_token: "${{ secrets.github_token }}"
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
- name: collect CPU statistics - name: collect CPU statistics
run: src/ci/scripts/collect-cpu-stats.sh run: src/ci/scripts/collect-cpu-stats.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
@ -588,7 +588,7 @@ jobs:
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with: with:
github_token: "${{ secrets.github_token }}" github_token: "${{ secrets.github_token }}"
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
- name: collect CPU statistics - name: collect CPU statistics
run: src/ci/scripts/collect-cpu-stats.sh run: src/ci/scripts/collect-cpu-stats.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB

View File

@ -134,7 +134,7 @@ x--expand-yaml-anchors--remove:
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with: with:
github_token: "${{ secrets.github_token }}" github_token: "${{ secrets.github_token }}"
if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'
<<: *step <<: *step
- name: collect CPU statistics - name: collect CPU statistics