From 8e8271075ad42f7d087abf19f74a96af4f9fb2a7 Mon Sep 17 00:00:00 2001 From: mferrera Date: Tue, 26 Nov 2024 08:27:14 +0100 Subject: [PATCH] CI: Revert macOS runner pkg-config work-around GitHub has updated their macOS images to install pkgconf over pkg-config. --- .github/workflows/publish.yml | 6 ------ .github/workflows/test.yml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 63d6ef44f..bf8d841e6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -46,12 +46,6 @@ jobs: - name: Install HDF5 for macOS arm64 if: ${{ matrix.os_arch[1] == 'macosx_arm64' }} run: | - # pkg-config formula is deprecated but it's still installed - # in GitHub Actions runner now. We can remove this once - # pkg-config formula is removed from GitHub Actions runner. - brew unlink pkg-config@0.29.2 - brew install pkgconf - echo "PKG_CONFIG=$(brew --prefix pkgconf)/bin/pkgconf" >> $GITHUB_ENV brew install hdf5 - name: Install cibuildwheel diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f808fd725..5cdb65e58 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,12 +38,6 @@ jobs: - name: Fix macos HDF5 library for pytables install (works for python >= 3.10) if: ${{ matrix.os == 'macos-latest' }} run: | - # pkg-config formula is deprecated but it's still installed - # in GitHub Actions runner now. We can remove this once - # pkg-config formula is removed from GitHub Actions runner. - brew unlink pkg-config@0.29.2 - brew install pkgconf - echo "PKG_CONFIG=$(brew --prefix pkgconf)/bin/pkgconf" >> $GITHUB_ENV brew install hdf5 - name: Setup xtgeo