Skip to content
Snippets Groups Projects
Commit 697e6ca0 authored by Arkadiusz Hiler's avatar Arkadiusz Hiler
Browse files

.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: default avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: default avatarPetri Latvala <petri.latvala@intel.com>
parent 72cdaf6a
No related branches found
No related tags found
No related merge requests found
Pipeline #60860 passed
...@@ -63,14 +63,14 @@ build-containers:build-fedora: ...@@ -63,14 +63,14 @@ build-containers:build-fedora:
build:tests-fedora: build:tests-fedora:
stage: build stage: build
script: script:
- meson --prefix=`pwd`/opt-igt $MESON_OPTIONS build - meson --prefix=/opt/igt $MESON_OPTIONS build
- ninja -C build - ninja -C build
- ninja -C build install - DESTDIR="$PWD/installdir" ninja -C build install
- ninja -C build igt-gpu-tools-doc - ninja -C build igt-gpu-tools-doc
artifacts: artifacts:
paths: paths:
- build - build
- opt-igt - installdir
build:tests-fedora-no-libunwind: build:tests-fedora-no-libunwind:
stage: build stage: build
......
...@@ -2,7 +2,7 @@ ARG CI_COMMIT_SHA ...@@ -2,7 +2,7 @@ ARG CI_COMMIT_SHA
ARG CI_REGISTRY_IMAGE ARG CI_REGISTRY_IMAGE
FROM $CI_REGISTRY_IMAGE/build-fedora:commit-$CI_COMMIT_SHA 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 COPY .gitlab-ci/docker-help.sh /usr/local/bin/docker-help.sh
ENV PATH="/opt/igt/bin:${PATH}" ENV PATH="/opt/igt/bin:${PATH}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment