From c4453ce1a517c3b6fa2a1fb6cce8b3398e88e9ec Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 3 Aug 2021 21:53:12 +0100 Subject: [PATCH] ci: Sanitise build and install paths No sense in generating enormously long paths. This also happens to fix artifacts not actually recording anything because we had a mismatch in artifact paths vs. actual paths. Signed-off-by: Daniel Stone --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfec933..c8fdf09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -159,9 +159,9 @@ armv7-debian-container_prep: variables: MESON_BUILD_TYPE: "-Dbuildtype=debug -Doptimization=0 -Db_sanitize=address,undefined" before_script: - - export BUILD_ID="wayland-$CI_JOB_NAME-$CI_COMMIT_SHA-$CI_JOB_ID" - - export PREFIX="$(pwd)/prefix-$BUILD_ID" - - export BUILDDIR="$(pwd)/build-$BUILD_ID" + - export BUILD_ID="wayland-$CI_JOB_NAME" + - export PREFIX="${CI_PROJECT_DIR}/prefix-${BUILD_ID}" + - export BUILDDIR="${CI_PROJECT_DIR}/build-${BUILD_ID}" - mkdir "$BUILDDIR" "$PREFIX" @@ -224,10 +224,10 @@ armv7-debian-container_prep: - meson test --num-processes ${FDO_CI_CONCURRENT:-4} - ninja clean artifacts: - name: wayland-meson-$CI_COMMIT_SHA-$CI_JOB_ID + name: wayland-$CI_JOB_NAME when: always paths: - - build-meson/meson-logs + - build-*/meson-logs - prefix-* -- 2.7.4