fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
Show stats 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: .ci-deqp-artifacts:
artifacts: artifacts:
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}" name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
when: always when: always
untracked: false untracked: false
paths: 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 # We don't want to download any previous job's artifacts
dependencies: [] dependencies: []
artifacts: artifacts:
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}" name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
when: always when: always
paths: paths:
- _build/meson-logs/*.txt - _build/meson-logs/*.txt

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

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

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

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

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

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

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

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