From 510286f419c991706569f5aa5894a4ca89b1537f Mon Sep 17 00:00:00 2001 From: Yat Ho Date: Tue, 10 Dec 2024 06:32:14 +0800 Subject: [PATCH] ci: remove macos pkgconf workaround (#7273) Xref: 1074c30e60ab5a4745619ea7bedef396f047c872 --- .github/workflows/actions.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 92ea2c63c..17d099c76 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -189,9 +189,7 @@ jobs: echo '${{ toJSON(runner) }}' sw_vers - name: Get Dependencies - run: | - brew uninstall -f pkg-config pkg-config@0.29.2 # https://github.com/actions/runner-images/issues/10984 - brew install --formulae cmake gettext libdeflate libevent libpsl miniupnpc ninja node pkgconf + run: brew install --formulae cmake gettext libdeflate libevent libpsl miniupnpc ninja node pkgconf - name: Get Source uses: actions/checkout@v4 with: @@ -352,9 +350,7 @@ jobs: echo '${{ toJSON(runner) }}' sw_vers - name: Get Dependencies - run: | - brew uninstall -f pkg-config pkg-config@0.29.2 # https://github.com/actions/runner-images/issues/10984 - brew install --formulae cmake gettext libdeflate libevent libpsl miniupnpc ninja node pkgconf + run: brew install --formulae cmake gettext libdeflate libevent libpsl miniupnpc ninja node pkgconf - name: Get Dependencies (GTK) if: ${{ needs.what-to-make.outputs.make-gtk == 'true' }} run: brew install --formula gtkmm3 @@ -412,8 +408,7 @@ jobs: echo '${{ toJSON(runner) }}' sw_vers - name: Get Dependencies - run: | - brew install --formulae cmake gettext libdeflate libevent libpsl miniupnpc ninja node pkgconf + run: brew install --formulae cmake gettext libdeflate libevent libpsl miniupnpc ninja node pkgconf - name: Get Source uses: actions/checkout@v4 with: @@ -632,9 +627,7 @@ jobs: echo '${{ toJSON(runner) }}' sw_vers - name: Get Dependencies - run: | - brew uninstall -f pkg-config pkg-config@0.29.2 # https://github.com/actions/runner-images/issues/10984 - brew install --formulae cmake gettext ninja node pkgconf + run: brew install --formulae cmake gettext ninja node pkgconf - name: Get Source uses: actions/download-artifact@v4 with: @@ -700,8 +693,7 @@ jobs: echo '${{ toJSON(runner) }}' sw_vers - name: Get Dependencies - run: | - brew install --formulae cmake gettext ninja node pkgconf + run: brew install --formulae cmake gettext ninja node pkgconf - name: Get Dependencies (GTK) if: ${{ needs.what-to-make.outputs.make-gtk == 'true' }} run: brew install --formula gtkmm3