diff options
| author | bors <bors@rust-lang.org> | 2025-01-10 00:09:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-10 00:09:46 +0000 |
| commit | 62bf38fa600f4beb878d61c537837729d4ee689e (patch) | |
| tree | 17239ed9f2beb888e9b4a98f95616e394786753c | |
| parent | 824759493246ee383beb9cd5ceffa0e15deb9fa4 (diff) | |
| parent | c8b29d6f6f9a7953e41fc71a6a7c6762cf489c39 (diff) | |
| download | rust-62bf38fa600f4beb878d61c537837729d4ee689e.tar.gz rust-62bf38fa600f4beb878d61c537837729d4ee689e.zip | |
Auto merge of #135303 - Kobzol:ci-fix-name, r=tgross35
CI: fix name of jobs There is a difference between the `image` (the Dockerfile), the `name` of the job (which determines also its properties) and the `full_name`, which includes the `auto/try/pr` prefix. Missed this in https://github.com/rust-lang/rust/pull/134898.
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rwxr-xr-x | src/ci/github-actions/ci.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8d7560ffcf..c650df6a0ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: run: python3 src/ci/github-actions/ci.py calculate-job-matrix >> $GITHUB_OUTPUT id: jobs job: - name: ${{ matrix.name }} + name: ${{ matrix.full_name }} needs: [ calculate_matrix ] runs-on: "${{ matrix.os }}" defaults: @@ -67,7 +67,7 @@ jobs: shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }} timeout-minutes: 360 env: - CI_JOB_NAME: ${{ matrix.image }} + CI_JOB_NAME: ${{ matrix.name }} CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse # commit of PR sha or commit sha. `GITHUB_SHA` is not accurate for PRs. HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }} @@ -233,7 +233,7 @@ jobs: env: DATADOG_SITE: datadoghq.com DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} - DD_GITHUB_JOB_NAME: ${{ matrix.name }} + DD_GITHUB_JOB_NAME: ${{ matrix.full_name }} run: | cd src/ci npm ci diff --git a/src/ci/github-actions/ci.py b/src/ci/github-actions/ci.py index 97539cf1cdb..b7dac412dbe 100755 --- a/src/ci/github-actions/ci.py +++ b/src/ci/github-actions/ci.py @@ -37,7 +37,7 @@ def add_job_properties(jobs: List[Dict], prefix: str) -> List[Job]: # Create a copy of the `job` dictionary to avoid modifying `jobs` new_job = dict(job) new_job["image"] = get_job_image(new_job) - new_job["name"] = f"{prefix} - {new_job['name']}" + new_job["full_name"] = f"{prefix} - {new_job['name']}" modified_jobs.append(new_job) return modified_jobs |