AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Fix artifact name for jobs with parallel indices

Browse Source 
GitLab mangled artifact filenames when `CI_JOB_NAME` contained a slash
(e.g. 1/4), resulting in broken names like `4.zip`.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13424
Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35796>
This commit is contained in:
Valentine Burley
2025-06-27 17:16:54 +02:00
committed by Marge Bot
parent e236a731e4
commit ef6273c43c
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -388,7 +388,7 @@ include:
.ci-deqp-artifacts:
artifacts:
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
when: always
untracked: false
paths:

2
.gitlab-ci/build/gitlab-ci.yml
View File

@@ -18,7 +18,7 @@
# We don't want to download any previous job's artifacts
dependencies: []
artifacts:
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
when: always
paths:
- _build/meson-logs/*.txt

2
.gitlab-ci/lava/lava-gitlab-ci.yml
View File

@@ -45,7 +45,7 @@ variables:
script:
- /lava/lava-submit.sh
artifacts:
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
when: always
paths:
- results/

10
.gitlab-ci/test/gitlab-ci.yml
View File

@@ -12,7 +12,7 @@
- section_end ldd_section
artifacts:
when: always
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
paths:
- results/
rules:
@@ -217,7 +217,7 @@ yaml-toml-shell-py-test:
.piglit-traces-test:
artifacts:
when: on_failure
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
reports:
junit: results/junit.xml
paths:
@@ -253,7 +253,7 @@ yaml-toml-shell-py-test:
- ./install/fossilize-runner.sh
artifacts:
when: on_failure
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
paths:
- results/
@@ -281,7 +281,7 @@ yaml-toml-shell-py-test:
BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
artifacts:
when: always
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
paths:
- results/
- serial*.txt
@@ -460,7 +460,7 @@ yaml-toml-shell-py-test:
# test execution.
artifacts:
when: always
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
paths:
- results
reports:

2
src/gallium/drivers/d3d12/ci/gitlab-ci.yml
View File

@@ -34,7 +34,7 @@
timeout: 12m
artifacts:
when: on_failure
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
paths:
- logs/
variables:

4
src/microsoft/ci/gitlab-ci.yml
View File

@@ -20,7 +20,7 @@ test-spirv2dxil-windows:
- . _install/spirv2dxil_run.ps1
artifacts:
when: on_failure
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
paths:
- spirv2dxil_results.txt
@@ -46,7 +46,7 @@ test-dozen-deqp:
- . _install/deqp_runner_run.ps1
artifacts:
when: on_failure
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
paths:
- results/
reports: