mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: Sanitise build and install paths

Browse source 
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>
This commit is contained in:
Daniel Stone 2021-08-03 21:53:12 +01:00
parent 7769b63141
commit c4453ce1a5
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -159,9 +159,9 @@ armv7-debian-container_prep:
variables: variables:
MESON_BUILD_TYPE: "-Dbuildtype=debug -Doptimization=0 -Db_sanitize=address,undefined" MESON_BUILD_TYPE: "-Dbuildtype=debug -Doptimization=0 -Db_sanitize=address,undefined"
before_script: before_script:
- export BUILD_ID="wayland-$CI_JOB_NAME-$CI_COMMIT_SHA-$CI_JOB_ID" - export BUILD_ID="wayland-$CI_JOB_NAME"
- export PREFIX="$(pwd)/prefix-$BUILD_ID" - export PREFIX="${CI_PROJECT_DIR}/prefix-${BUILD_ID}"
- export BUILDDIR="$(pwd)/build-$BUILD_ID" - export BUILDDIR="${CI_PROJECT_DIR}/build-${BUILD_ID}"
- mkdir "$BUILDDIR" "$PREFIX" - mkdir "$BUILDDIR" "$PREFIX"
@ -224,10 +224,10 @@ armv7-debian-container_prep:
- meson test --num-processes ${FDO_CI_CONCURRENT:-4} - meson test --num-processes ${FDO_CI_CONCURRENT:-4}
- ninja clean - ninja clean
artifacts: artifacts:
name: wayland-meson-$CI_COMMIT_SHA-$CI_JOB_ID name: wayland-$CI_JOB_NAME
when: always when: always
paths: paths:
- build-meson/meson-logs - build-*/meson-logs
- prefix-* - prefix-*