diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-08-03 21:53:12 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2021-08-04 18:20:27 +0100 |
| commit | c4453ce1a517c3b6fa2a1fb6cce8b3398e88e9ec (patch) | |
| tree | f3a9db690262ca6e2d09544efaca85a9188f6fb5 /.gitlab-ci.yml | |
| parent | 7769b63141ee5ebbc0f8ca7af84d6503487de26b (diff) | |
| download | wayland-c4453ce1a517c3b6fa2a1fb6cce8b3398e88e9ec.tar.gz | |
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 <daniels@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files 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-* |