8000 Rollup merge of #74600 - Mark-Simulacrum:try-perf, r=pietroalbini · Manishearth/rust@829d416 · GitHub < 8000 link rel="icon" class="js-site-favicon" type="image/svg+xml" href="https://github.githubassets.com/favicons/favicon.svg" data-base-href="https://github.githubassets.com/favicons/favicon">
[go: up one dir, main page]
Skip to content

Commit 829d416

Browse files
ManishearthManishearth
authored
Rollup merge of rust-lang#74600 - Mark-Simulacrum:try-perf, r=pietroalbini
Enable perf try builder This adds a dedicated branch for perf to use for CI, intended to allow perf to enqueue builds without needing to use bors. bors is great, but bors requires an open PR to work, and we want to invoke perf on closed PRs sometimes (in particular, rollups).
2 parents 6232dde + 747bc8e commit 829d416

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ name: CI
2020
branches:
2121
- auto
2222
- try
23+
- try-perf
2324
- master
2425
pull_request:
2526
branches:
@@ -146,7 +147,7 @@ jobs:
146147
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
147148
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
148149
CACHE_DOMAIN: ci-caches.rust-lang.org
149-
if: "github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
150+
if: "github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
150151
strategy:
151152
matrix:
152153
include:
@@ -717,7 +718,7 @@ jobs:
717718
try-success:
718719
needs:
719720
- try
720-
if: "success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
721+
if: "success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
721722
steps:
722723
- name: mark the job as a success
723724
run: exit 0
@@ -727,7 +728,7 @@ jobs:
727728
try-failure:
728729
needs:
729730
- try
730-
if: "!success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
731+
if: "!success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
731732
steps:
732733
- name: mark the job as a failure
733734
run: exit 1

‎src/ci/github-actions/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ on:
247247
branches:
248248
- auto
249249
- try
250+
- try-perf
250251
- master
251252
pull_request:
252253
branches:
@@ -285,7 +286,7 @@ jobs:
285286
name: try
286287
env:
287288
<<: [*shared-ci-variables, *prod-variables]
288-
if: github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'
289+
if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
289290
strategy:
290291
matrix:
291292
include:
@@ -645,11 +646,11 @@ jobs:
645646
# successful listening to webhooks only.
646647
try-success:
647648
needs: [try]
648-
if: "success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
649+
if: "success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
649650
<<: *base-success-job
650651
try-failure:
651652
needs: [try]
652-
if: "!success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
653+
if: "!success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
653654
<<: *base-failure-job
654655
auto-success:
655656
needs: [auto]

0 commit comments

Comments
 (0)
0