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

CI: turn BUILDDIR and PREFIX into CI variables

Browse Source 
Change BUILDDIR and PREFIX from exported shell variables into CI
variables. This way they can be used in CI configuration, e.g.
artifacts.

The main reason for this change is that it makes it possible to use
these variables in after_script, which is not possible with shell
variables as the values do not carry over there.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2021-05-14 13:34:49 +03:00 committed by Daniel Stone
parent c76cf48f3e
commit b27f539714
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitlab-ci.yml
View File

@ -37,6 +37,9 @@ container_prep:
- .fdo.distribution-image@debian
timeout: 5m
stage: build
variables:
BUILDDIR: $CI_PROJECT_DIR/build-weston-$CI_JOB_NAME
PREFIX: $CI_PROJECT_DIR/prefix-weston-$CI_JOB_NAME
before_script:
- git clone --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols
- export WAYLAND_PROTOCOLS_DIR="$(pwd)/prefix-wayland-protocols"
@ -50,9 +53,6 @@ container_prep:
- make install
- cd ../../
- export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
- export BUILD_ID="weston-$CI_JOB_NAME"
- export PREFIX="$(pwd)/prefix-$BUILD_ID"
- export BUILDDIR="$(pwd)/build-$BUILD_ID"
- export TESTS_RES_PATH="$BUILDDIR/tests-res.txt"
- mkdir "$BUILDDIR" "$PREFIX"
@ -76,12 +76,12 @@ container_prep:
name: weston-$CI_COMMIT_SHA
when: always
paths:
- build-*/*.png
- build-*/meson-logs
- build-*/weston-virtme
- prefix-*
- $BUILDDIR/*.png
- $BUILDDIR/meson-logs
- $BUILDDIR/weston-virtme
- $PREFIX
reports:
junit: build-*/meson-logs/testlog.junit.xml
junit: $BUILDDIR/meson-logs/testlog.junit.xml
.build-native-meson-no-test:
extends: .build-native
@ -98,8 +98,8 @@ container_prep:
name: weston-$CI_COMMIT_SHA
when: always
paths:
- build-*/meson-logs
- prefix-*
- $BUILDDIR/meson-logs
- $PREFIX
build-native-meson-default-options:
variables:
@ -111,12 +111,12 @@ build-native-meson-default-options:
-Dlauncher-libseat=true
extends: .build-native-meson
after_script:
- ninja -C build-* coverage-html
- ninja -C build-* coverage-xml
- sed -i -e 's/\/build-weston-build-native-meson-default-options//' -e 's/\"..\//\"/' build-*/meson-logs/coverage.xml
- ninja -C "$BUILDDIR" coverage-html
- ninja -C "$BUILDDIR" coverage-xml
- sed -i -e 's/\/build-weston-build-native-meson-default-options//' -e 's/\"..\//\"/' "$BUILDDIR/meson-logs/coverage.xml"
artifacts:
reports:
cobertura: build-*/meson-logs/coverage.xml
cobertura: $BUILDDIR/meson-logs/coverage.xml
build-docs:
variables: