From 36ad69e65eada6eef3b1ebca282353c7905c47e8 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 21 Jun 2021 21:44:37 +0100 Subject: [PATCH] CI: Deduplicate $PATH No need to set it twice. Signed-off-by: Daniel Stone --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 642f5671..0e7f7117 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,6 +120,7 @@ container_prep: BUILDDIR: $CI_PROJECT_DIR/build-weston-$CI_JOB_NAME PREFIX: $CI_PROJECT_DIR/prefix-weston-$CI_JOB_NAME before_script: + - export PATH=~/.local/bin:$PATH - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" - export TESTS_RES_PATH="$BUILDDIR/tests-res.txt" - mkdir "$BUILDDIR" "$PREFIX" @@ -132,7 +133,6 @@ container_prep: tags: - kvm script: - - export PATH=~/.local/bin:$PATH - cd "$BUILDDIR" - meson --prefix="$PREFIX" -Db_sanitize=address ${MESON_OPTIONS} .. - ninja -k0 -j${FDO_CI_CONCURRENT:-4} @@ -160,7 +160,6 @@ container_prep: tags: - kvm script: - - export PATH=~/.local/bin:$PATH - cd "$BUILDDIR" - meson --prefix="$PREFIX" ${MESON_OPTIONS} .. - ninja -k0 -j${FDO_CI_CONCURRENT:-4}