summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorArkadiusz Hiler <arkadiusz.hiler@intel.com>2019-09-03 11:10:45 +0300
committerArkadiusz Hiler <arkadiusz.hiler@intel.com>2019-09-03 18:27:05 +0300
commit697e6ca07d503517996b0a3e385ba5b1ce720346 (patch)
treea60a9d2476be7297dc235d244af3eae0137e296b /.gitlab-ci.yml
parent72cdaf6aadc16c42651722b8db71efc673da2b06 (diff)
.gitlab-ci: Use true --prefix
We have to use the final location of IGT for --prefix as some of the binaries use that for asset lookup (e.g. register definitions that end up in $PREFIX/share/). To install it under a local directory during the early build steps it's better to use $DESTDIR. Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c57d86c3..17378df5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,14 +63,14 @@ build-containers:build-fedora:
build:tests-fedora:
stage: build
script:
- - meson --prefix=`pwd`/opt-igt $MESON_OPTIONS build
+ - meson --prefix=/opt/igt $MESON_OPTIONS build
- ninja -C build
- - ninja -C build install
+ - DESTDIR="$PWD/installdir" ninja -C build install
- ninja -C build igt-gpu-tools-doc
artifacts:
paths:
- build
- - opt-igt
+ - installdir
build:tests-fedora-no-libunwind:
stage: build