From 0eee458431f95f2d6e49fdc0e9556adcb300ef32 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 25 Jun 2024 11:37:45 -0500 Subject: [PATCH 1/3] build: try adding libtool to brew install (it's not default with build tools in OS14) --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12e4d1ba..6b3c3284 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: fail-fast: false matrix: python-version: ["3.8", "3.12"] - runs-on: [ubuntu-latest, macos-13] + runs-on: [ubuntu-latest, macos-13, macos-latest] arch: [auto64] steps: - uses: actions/checkout@v4 @@ -48,7 +48,7 @@ jobs: - name: Install compiler tools on macOS if: runner.os == 'macOS' run: | - brew install make automake swig gmp mpfr boost + brew install make automake swig gmp mpfr boost libtool export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" - name: Install extra deps on Linux @@ -69,7 +69,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13] + os: [ubuntu-latest, macos-13, macos-latest] python: [312] arch: [auto64] @@ -86,7 +86,7 @@ jobs: - name: Install compiler tools on macOS if: runner.os == 'macOS' run: | - brew install make automake swig gmp mpfr boost + brew install make automake swig gmp mpfr boost libtool export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" - uses: pypa/cibuildwheel@v2.17 From b02058bb81c92eac115f2435315c71703b885309 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 25 Jun 2024 11:41:28 -0500 Subject: [PATCH 2/3] force with reinstall --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b3c3284..68c7fdd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: - name: Install compiler tools on macOS if: runner.os == 'macOS' run: | - brew install make automake swig gmp mpfr boost libtool + brew reinstall make automake swig gmp mpfr boost libtool export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" - name: Install extra deps on Linux @@ -86,7 +86,7 @@ jobs: - name: Install compiler tools on macOS if: runner.os == 'macOS' run: | - brew install make automake swig gmp mpfr boost libtool + brew reinstall make automake swig gmp mpfr boost libtool export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" - uses: pypa/cibuildwheel@v2.17 From 43665483af8d04538c9f002127f31507f745c778 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 25 Jun 2024 12:30:43 -0500 Subject: [PATCH 3/3] paranoia --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68c7fdd9..4e955dc6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,7 @@ jobs: run: | brew reinstall make automake swig gmp mpfr boost libtool export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" + eval "$(/opt/homebrew/bin/brew shellenv)" - name: Install extra deps on Linux if: runner.os == 'Linux' @@ -88,6 +89,7 @@ jobs: run: | brew reinstall make automake swig gmp mpfr boost libtool export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" + eval "$(/opt/homebrew/bin/brew shellenv)" - uses: pypa/cibuildwheel@v2.17 env: