From abbd284156a6cafbe9d747c7d22e971a0f811107 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Wed, 13 Dec 2023 22:38:04 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20CI:=20Install=20pkg-config=20fro?= =?UTF-8?q?m=20tpm's=20repo=20on=20Windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hopefully this finally fixes the Windows CI being unable to download `pkg-config`. Fixes #441. --- .github/workflows/rust.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3fb29d0f1..113a665c2 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -90,7 +90,8 @@ jobs: RUST_LOG: trace ErrorActionPreference: Stop WarningPreference: Stop - PKG_CONFIG_PATH: C:/lib/pkgconfig + PKG_CONFIG: C:\bin\pkg-config.exe + PKG_CONFIG_PATH: C:\lib\pkgconfig DBUS_SESSION_BUS_ADDRESS: tcp:host=127.0.0.1,port=9876 TRYBUILD: overwrite # ignore ui tests steps: @@ -107,6 +108,7 @@ jobs: c:/bin/xmlwf.exe c:/bin/*dbus* c:/lib/*dbus* + c:/bin/*pkg-config* c:/var/lib/*dbus* c:/lib/*glib* c:/lib/*gio* @@ -133,17 +135,20 @@ jobs: c:/bin/*intl* key: ${{ runner.os }}-cache - - name: Install pkg-config + - name: Install Meson and Ninja + if: steps.cache-deps.outputs.cache-hit != 'true' shell: pwsh - run: | - # This is needed for some reason: https://github.com/dbus2/zbus/actions/runs/4917893488/jobs/8783555606 - choco feature enable -n allowEmptyChecksums - choco install -y pkgconfiglite + run: pip3 install meson ninja - - name: Install Meson + - name: Install pkg-config if: steps.cache-deps.outputs.cache-hit != 'true' shell: pwsh - run: pip3 install meson + run: | + git clone --branch meson-glib-subproject --depth 1 https://gitlab.freedesktop.org/tpm/pkg-config.git + cd pkg-config + meson build -Dprefix=C:\ --buildtype release + ninja -C build + ninja -C build install - name: Setup MSVC Environment if: steps.cache-deps.outputs.cache-hit != 'true'