diff options
| -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}" |