From abc41dda5a709cdbbae45e85f10748b18ebf5196 Mon Sep 17 00:00:00 2001 From: hhugo Date: Tue, 19 Nov 2024 21:56:31 +0100 Subject: [PATCH 1/4] Update build.yml --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b017d9e53..85ae3fc1aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,6 +97,12 @@ jobs: # try to install them anyways, so we save an apt-roundtrip. sudo aptitude -o Acquire::Retries=30 install gcc-multilib g++-multilib pkg-config libgmp-dev libgmp-dev:i386 libx11-dev:i386 -y + - name: macos fix + if: runner.os == 'Macos' + run: | + # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 + brew uninstall --ignore-dependencies --force pkg-config@0.29.2 + - name: Checkout tree uses: actions/checkout@v4 From ad45a9366c912d39450157e7e9311e6abe3a1303 Mon Sep 17 00:00:00 2001 From: hhugo Date: Tue, 19 Nov 2024 22:01:51 +0100 Subject: [PATCH 2/4] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85ae3fc1aa..cee8107b19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,8 +100,8 @@ jobs: - name: macos fix if: runner.os == 'Macos' run: | - # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 brew uninstall --ignore-dependencies --force pkg-config@0.29.2 + # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 - name: Checkout tree uses: actions/checkout@v4 From a9b9504750b68a30cbe8023ec27252a60fe5f971 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 20 Nov 2024 13:47:14 +0100 Subject: [PATCH 3/4] WIP --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cee8107b19..4c2d9a07a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,7 +100,9 @@ jobs: - name: macos fix if: runner.os == 'Macos' run: | - brew uninstall --ignore-dependencies --force pkg-config@0.29.2 + brew update + brew upgrade + brew install pkgconf # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 - name: Checkout tree From 4c85c7bf9ca29fb3669cac46b2feea961cf7d936 Mon Sep 17 00:00:00 2001 From: hhugo Date: Wed, 20 Nov 2024 15:44:27 +0100 Subject: [PATCH 4/4] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c2d9a07a5..927e38546b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: brew update brew upgrade brew install pkgconf - # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984 + # work around https://github.com/actions/runner-images/issues/10984 - name: Checkout tree uses: actions/checkout@v4