diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-12-05 09:08:14 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-12-05 16:43:40 +0100 |
| commit | b55279bdb765933eb29e52b4805c817ceed5776a (patch) | |
| tree | 76a048070bc9efdb7808c62bf3d485197f9618fe /.gitlab-ci.yml | |
| parent | 5c8f89f67c7b32014bc22421e48f3c0cf4e5ca3a (diff) | |
gitlab-ci: Always set PKG_CONFIG_PATH
meson gets grumpy if that changes between invocations.
I'm not entirely clear on why this happens with the interim runner
from gnome folks, but it does. We do still run the exact same image,
with the exact same meson version. But someone the old runner didn't
complain, while the new one does.
Note that the jobs still fail because the interim runner is dead slow
(10x-100x slower to run the library tests) and times out after 30s on
tests that take 1s max.
Acked-by: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5cbb4287..8087bd39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,8 @@ build:tests-debian-meson-arm64: image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-arm64:latest stage: build script: - - PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/ meson --cross-file meson-cross-arm64.txt build + - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/ + - meson --cross-file meson-cross-arm64.txt build - ninja -C build artifacts: paths: @@ -92,6 +93,7 @@ test:ninja-test-arm64: - build:tests-debian-meson-arm64 stage: test script: + - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/ - env > build/envdump.txt - ninja -C build test artifacts: |