[igt-dev] [PATCH i-g-t] gitlab-ci: Always set PKG_CONFIG_PATH

[Daniel Vetter]

On Wed, Dec 05, 2018 at 09:08:14AM +0100, Daniel Vetter wrote:
> 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.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Merged with Petri's irc-ack.
-Daniel

> ---
>  .gitlab-ci.yml | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 5cbb4287523e..8087bd398f3d 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:
> -- 
> 2.20.0.rc1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch