diff options
| author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-09-03 11:10:45 +0300 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-09-03 18:27:05 +0300 |
| commit | 697e6ca07d503517996b0a3e385ba5b1ce720346 (patch) | |
| tree | a60a9d2476be7297dc235d244af3eae0137e296b | |
| parent | 72cdaf6aadc16c42651722b8db71efc673da2b06 (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>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 4 insertions, 4 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 @@ -2,7 +2,7 @@ ARG CI_COMMIT_SHA ARG CI_REGISTRY_IMAGE FROM $CI_REGISTRY_IMAGE/build-fedora:commit-$CI_COMMIT_SHA -COPY opt-igt /opt/igt +COPY installdir/opt/igt /opt/igt COPY .gitlab-ci/docker-help.sh /usr/local/bin/docker-help.sh ENV PATH="/opt/igt/bin:${PATH}" |