build: macos x86_64 wheels using macos-13 runner (#332)

* build: try to get universal builds working

* try setting environment variables through GITHUB_ENV

* expand vars, don't use +=

* try separate x86_64 build for macos

* try macos-13 runner

* use same cibw for everything

* add macos-13 to build matrix

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: lgray

.github/workflows/ci.yml

@@ -83,7 +83,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, macos-13]
         python: [313]
         arch: [auto64]
 
@@ -96,6 +96,12 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           brew install make automake swig mpfr boost libtool
+          echo "PATH=/opt/homebrew/opt/make/libexec/gnubin:/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" >> "$GITHUB_ENV"
+          echo "CPPFLAGS=-I/opt/homebrew/include -L/opt/homebrew/lib $CPPFLAGS" >> "$GITHUB_ENV"
+          echo "CXXFLAGS=-I/opt/homebrew/include -L/opt/homebrew/lib $CXXFLAGS" >> "$GITHUB_ENV"
+          echo "CFLAGS=-I/opt/homebrew/include -L/opt/homebrew/lib $CFLAGS" >> "$GITHUB_ENV"
+          echo "LDFLAGS=-L/opt/homebrew/lib $LDFLAGS" >> "$GITHUB_ENV"
+          echo "MACOSX_DEPLOYMENT_TARGET=11.0" >> "$GITHUB_ENV"
 
       - name: Clone gmp
         if: runner.os == 'macOS'
@@ -106,8 +112,6 @@ jobs:
 
       - name: Build gmp from source for MACOSX_DEPLOYMENT_TARGET
         if: runner.os == 'macOS'
-        env:
-          MACOSX_DEPLOYMENT_TARGET: 11.0
         working-directory: gmp-6.3
         run: |
           brew install texinfo
@@ -121,20 +125,6 @@ jobs:
           make install
 
       - uses: pypa/[email protected]
-        if: runner.os == 'macOS'
-        name: "pypa/[email protected] (macos)"
-        env:
-          CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BUILD: cp${{ matrix.python }}-*
-          CIBW_BUILD_VERBOSITY: 2
-          MACOSX_DEPLOYMENT_TARGET: 11.0
-          CPPFLAGS: -I/opt/homebrew/include -L/opt/homebrew/lib
-          CXXFLAGS: -I/opt/homebrew/include -L/opt/homebrew/lib
-          CFLAGS: -I/opt/homebrew/include -L/opt/homebrew/lib
-          LDFLAGS: -L/opt/homebrew/lib
-
-      - uses: pypa/[email protected]
-        if: runner.os != 'macOS'
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_BUILD: cp${{ matrix.python }}-*

.github/workflows/wheels.yml

@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python: [39, 310, 311, 312, 313]
-        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, macos-13]
         arch: [auto64]
 
     steps:
@@ -45,6 +45,12 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           brew install make automake swig mpfr boost libtool
+          echo "PATH=/opt/homebrew/opt/make/libexec/gnubin:/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" >> "$GITHUB_ENV"
+          echo "CPPFLAGS=-I/opt/homebrew/include -L/opt/homebrew/lib $CPPFLAGS" >> "$GITHUB_ENV"
+          echo "CXXFLAGS=-I/opt/homebrew/include -L/opt/homebrew/lib $CXXFLAGS" >> "$GITHUB_ENV"
+          echo "CFLAGS=-I/opt/homebrew/include -L/opt/homebrew/lib $CFLAGS" >> "$GITHUB_ENV"
+          echo "LDFLAGS=-L/opt/homebrew/lib $LDFLAGS" >> "$GITHUB_ENV"
+          echo "MACOSX_DEPLOYMENT_TARGET=11.0" >> "$GITHUB_ENV"
 
       - name: Clone gmp
         if: runner.os == 'macOS'
@@ -55,8 +61,6 @@ jobs:
 
       - name: Build gmp from source for MACOSX_DEPLOYMENT_TARGET
         if: runner.os == 'macOS'
-        env:
-          MACOSX_DEPLOYMENT_TARGET: 11.0
         working-directory: gmp-6.3
         run: |
           export PATH="/opt/homebrew/opt/make/libexec/gnubin:/opt/homebrew/opt/libtool/libexec/gnubin:$PATH"
@@ -71,20 +75,6 @@ jobs:
           make install
 
       - uses: pypa/[email protected]
-        if: runner.os == 'macOS'
-        name: "pypa/[email protected] (macos)"
-        env:
-          CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BUILD: cp${{ matrix.python }}-*
-          CIBW_BUILD_VERBOSITY: 2
-          MACOSX_DEPLOYMENT_TARGET: 11.0
-          CPPFLAGS: -I/opt/homebrew/include -L/opt/homebrew/lib
-          CXXFLAGS: -I/opt/homebrew/include -L/opt/homebrew/lib
-          CFLAGS: -I/opt/homebrew/include -L/opt/homebrew/lib
-          LDFLAGS: -L/opt/homebrew/lib
-
-      - uses: pypa/[email protected]
-        if: runner.os != 'macOS'
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_BUILD: cp${{ matrix.python }}-*

setup.py

@@ -123,8 +123,8 @@ def build_extensions(self):
                     "./configure",
                     f"--fastjet-config={FASTJET}/fastjet-config",
                     f'CXX={env["CXX"]}',
-                    "CXXFLAGS="
-                    + env.get("CXXFLAGS", "-O3 -Bstatic -Bdynamic -std=c++17"),
+                    "CXXFLAGS=-O3 -Bstatic -Bdynamic -std=c++17 "
+                    + env.get("CXXFLAGS", ""),
                     f'LDFLAGS={env["LDFLAGS"]}',
                 ],
                 cwd=FASTJET_CONTRIB,