From 938e50c876f1764505f2b90146bf08c719b997d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Sun, 18 Feb 2024 20:18:01 +0100 Subject: [PATCH] ci: Use auditable sources for pkg-config and bison We need to provide pkg-config and bison to build the introspection feature. They were previously pre-installed on the runner and are now provided by dedicated projects for better reproducability to get away from "works on my machine". --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1c26e59cf..3a4c02e8f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -234,8 +234,8 @@ macos-x86_64: # can trigger race conditions in the gobject-introspection subproject. - bash .gitlab-ci/show-info-osx.sh - python3 -m venv .venv - - ln -s /opt/pkg-config/bin/pkg-config .venv/bin - - ln -s /opt/bison/bin/bison .venv/bin + - curl -L $CI_API_V4_URL/projects/30437/packages/generic/pkgconfig/v0.29.2+10/pkg-config-0.29.2+10_$(uname -m).tar.xz | tar -C .venv -xJ + - curl -L $CI_API_V4_URL/projects/30438/packages/generic/bison/v3.8.2+3/bison-3.8.2+3_$(uname -m).tar.xz | tar -C .venv -xJ - source .venv/bin/activate - pip3 install meson==1.2.0 - pip3 install ninja==1.11.1