Move TOOLSTATE_REPO to top-level env

This commit is contained in:
Jakub Beránek 2024-04-27 11:36:42 +02:00
parent e82c28debc
commit 163ea3328b
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
2 changed files with 5 additions and 2 deletions

View File

@ -34,6 +34,8 @@ defaults:
concurrency: concurrency:
group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}" group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
cancel-in-progress: true cancel-in-progress: true
env:
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
jobs: jobs:
calculate_matrix: calculate_matrix:
name: Calculate job matrix name: Calculate job matrix
@ -61,7 +63,6 @@ jobs:
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}" HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}" DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
SCCACHE_BUCKET: rust-lang-ci-sccache2 SCCACHE_BUCKET: rust-lang-ci-sccache2
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
CACHE_DOMAIN: ci-caches.rust-lang.org CACHE_DOMAIN: ci-caches.rust-lang.org
continue-on-error: "${{ matrix.continue_on_error || false }}" continue-on-error: "${{ matrix.continue_on_error || false }}"
strategy: strategy:

View File

@ -84,6 +84,9 @@ concurrency:
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }} group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}
cancel-in-progress: true cancel-in-progress: true
env:
TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
jobs: jobs:
# The job matrix for `calculate_matrix` is defined in src/ci/github-actions/jobs.yml. # The job matrix for `calculate_matrix` is defined in src/ci/github-actions/jobs.yml.
# It calculates which jobs should be executed, based on the data of the ${{ github }} context. # It calculates which jobs should be executed, based on the data of the ${{ github }} context.
@ -114,7 +117,6 @@ jobs:
HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }} HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
DOCKER_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SCCACHE_BUCKET: rust-lang-ci-sccache2 SCCACHE_BUCKET: rust-lang-ci-sccache2
TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
CACHE_DOMAIN: ci-caches.rust-lang.org CACHE_DOMAIN: ci-caches.rust-lang.org
continue-on-error: ${{ matrix.continue_on_error || false }} continue-on-error: ${{ matrix.continue_on_error || false }}
strategy: strategy: