From de3ce4c70678818950193a39425aa35cb1f10139 Mon Sep 17 00:00:00 2001 From: Paul-Edouard Sarlin <15985472+sarlinpe@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:57:09 +0200 Subject: [PATCH] macOS CI: fix failing 11, add 13 (#189) * Skip unnecessary upgrades * Add macOS 13 to CI --- .github/workflows/build-new.yml | 2 +- package/build-wheels-macos.sh | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-new.yml b/.github/workflows/build-new.yml index 90a48d39..df3df039 100644 --- a/.github/workflows/build-new.yml +++ b/.github/workflows/build-new.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-11, macos-12 ] + os: [ macos-11, macos-12, macos-13 ] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/package/build-wheels-macos.sh b/package/build-wheels-macos.sh index aea1870e..9576ac55 100755 --- a/package/build-wheels-macos.sh +++ b/package/build-wheels-macos.sh @@ -18,8 +18,6 @@ brew remove swiftlint brew remove node@18 brew update -brew upgrade -brew install wget cmake for PYTHON_VERSION in ${PYTHON_VERSIONS[@]}; do brew install --force "python@${PYTHON_VERSION}" @@ -28,6 +26,7 @@ done brew install \ git \ + wget \ cmake \ eigen \ freeimage \ @@ -38,17 +37,12 @@ brew install \ suite-sparse \ ceres-solver \ glew \ - cgal \ sqlite3 \ libomp \ llvm \ boost \ lz4 -brew info gcc -brew upgrade gcc -brew info gcc - # Install Boost #mkdir -p boost #cd boost