mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Deduplicate $PATH

Browse Source 
No need to set it twice.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2021-06-21 21:44:37 +01:00
parent 3e6b6a4095
commit 36ad69e65e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -120,6 +120,7 @@ container_prep:
BUILDDIR: $CI_PROJECT_DIR/build-weston-$CI_JOB_NAME BUILDDIR: $CI_PROJECT_DIR/build-weston-$CI_JOB_NAME
PREFIX: $CI_PROJECT_DIR/prefix-weston-$CI_JOB_NAME PREFIX: $CI_PROJECT_DIR/prefix-weston-$CI_JOB_NAME
before_script: before_script:
- export PATH=~/.local/bin:$PATH
- export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
- export TESTS_RES_PATH="$BUILDDIR/tests-res.txt" - export TESTS_RES_PATH="$BUILDDIR/tests-res.txt"
- mkdir "$BUILDDIR" "$PREFIX" - mkdir "$BUILDDIR" "$PREFIX"
@ -132,7 +133,6 @@ container_prep:
tags: tags:
- kvm - kvm
script: script:
- export PATH=~/.local/bin:$PATH
- cd "$BUILDDIR" - cd "$BUILDDIR"
- meson --prefix="$PREFIX" -Db_sanitize=address ${MESON_OPTIONS} .. - meson --prefix="$PREFIX" -Db_sanitize=address ${MESON_OPTIONS} ..
- ninja -k0 -j${FDO_CI_CONCURRENT:-4} - ninja -k0 -j${FDO_CI_CONCURRENT:-4}
@ -160,7 +160,6 @@ container_prep:
tags: tags:
- kvm - kvm
script: script:
- export PATH=~/.local/bin:$PATH
- cd "$BUILDDIR" - cd "$BUILDDIR"
- meson --prefix="$PREFIX" ${MESON_OPTIONS} .. - meson --prefix="$PREFIX" ${MESON_OPTIONS} ..
- ninja -k0 -j${FDO_CI_CONCURRENT:-4} - ninja -k0 -j${FDO_CI_CONCURRENT:-4}