From 978c0989eba1e307007ed493b9221fbe295ccb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Fri, 31 Jan 2025 06:22:28 +0200 Subject: [PATCH] ci: fix the artifact name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This has probably no incidence on anything else but human-visible names but let's fix it anyway. Fixes: ef3091736c3e ("ci: use CI_PROJECT_NAME for artifacts name") Signed-off-by: Martin Roukala (né Peres) Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/build/gitlab-ci.yml | 2 +- .gitlab-ci/test/gitlab-ci.yml | 8 ++++---- src/gallium/drivers/d3d12/ci/gitlab-ci.yml | 2 +- src/microsoft/ci/gitlab-ci.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff8e693181d..6f48dc48d32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -258,7 +258,7 @@ include: .ci-deqp-artifacts: artifacts: - name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" + name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}" when: always untracked: false paths: diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index a3a10ec2176..d4ae704eda4 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -16,7 +16,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}" when: always paths: - _build/meson-logs/*.txt diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 4c31c058362..c35cd7b6cb3 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -143,7 +143,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}" reports: junit: results/junit.xml paths: @@ -177,7 +177,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}" paths: - results/ @@ -205,7 +205,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}" paths: - results/ - serial*.txt @@ -399,7 +399,7 @@ yaml-toml-shell-py-test: artifacts: when: always - name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" + name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - results reports: diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml index fad7f4e1d35..93f6499f7d0 100644 --- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml +++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml @@ -23,7 +23,7 @@ - . _install/piglit_run.ps1 artifacts: when: on_failure - name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" + name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - logs/ variables: diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml index f67b8fcfaae..9866e856a46 100644 --- a/src/microsoft/ci/gitlab-ci.yml +++ b/src/microsoft/ci/gitlab-ci.yml @@ -18,7 +18,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}" paths: - spirv2dxil_results.txt @@ -42,7 +42,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}" paths: - results/ reports: