Skip to content

Commit

Permalink
Use preinstalled pkg-config.
Browse files Browse the repository at this point in the history
  • Loading branch information
teo-tsirpanis committed Nov 21, 2024
1 parent 2d2ed4c commit c1f16fd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/ci-linux_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,11 @@ jobs:
if: inputs.cmake_generator == 'Ninja'
uses: seanmiddleditch/gha-setup-ninja@v4

# Remove pre-installed legacy pkg-config package.
# See https://github.com/actions/runner-images/issues/10984
# and https://github.com/dotnet/runtime/pull/109968
- name: 'Brew setup on macOS' # x-ref c8e49ba8f8b9ce
if: ${{ startsWith(matrix.os, 'macos-') == true }}
run: |
set -e pipefail
brew uninstall --ignore-dependencies --force [email protected]
brew install automake pkgconf
brew install automake
- name: 'Configure libtiledb'
id: configure
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,9 @@ jobs:
- name: Checkout TileDB
# v4 uses node 20 which is incompatible with the libc version of the manylinux image
uses: actions/checkout@v3
# Remove pre-installed legacy pkg-config package.
# See https://github.com/actions/runner-images/issues/10984
# and https://github.com/dotnet/runtime/pull/109968
- name: 'Homebrew setup'
run: |
brew uninstall --ignore-dependencies --force [email protected]
brew install automake pkgconf ninja
brew install automake ninja
if: ${{ startsWith(matrix.os, 'macos-') == true }}
- name: Export GitHub Actions cache variables
uses: actions/github-script@v6
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/unit-test-runs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,9 @@ jobs:
steps:
- uses: actions/checkout@v3

# Remove pre-installed legacy pkg-config package.
# See https://github.com/actions/runner-images/issues/10984
# and https://github.com/dotnet/runtime/pull/109968
- name: 'Homebrew setup'
run: |
brew uninstall --ignore-dependencies --force [email protected]
brew install automake pkgconf
brew install automake
if: ${{ startsWith(matrix.os, 'macos-') }}

- name: Install Ninja
Expand Down

0 comments on commit c1f16fd

Please sign in to comment.