From c3e82f47df1c6eaa43fdf60a3030dbf4e330213b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20No=C3=ABl?= Date: Thu, 11 Dec 2025 13:17:16 -0300 Subject: [PATCH 1/2] Now using macos15-intel instead of macos-13, using g++14 --- .github/workflows/build_binaries.yml | 43 ++++++++++++++-------------- .github/workflows/tests.yml | 4 +-- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml index cd0e5b943..ef267578c 100644 --- a/.github/workflows/build_binaries.yml +++ b/.github/workflows/build_binaries.yml @@ -127,17 +127,17 @@ jobs: {short_name: "episode", project: "episode-sample", name: "PhysiCell Episode", binary: "project", extra_run: ""}, ] - runs-on: macos-13 + runs-on: macos-15-intel steps: - uses: actions/checkout@v4 - name: Install dependencies run : | - if ! brew list gcc@13 &>/dev/null; then - brew install gcc@13 + if ! brew list gcc@14 &>/dev/null; then + brew install gcc@14 else - echo "gcc@13 is already installed." + echo "gcc@14 is already installed." fi - name: Build ${{ matrix.projects.name }} project @@ -146,15 +146,15 @@ jobs: make ${{ matrix.projects.project }} make clean ${{ matrix.projects.extra_run }} - make PHYSICELL_CPP=g++-13 static - cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos13 + make PHYSICELL_CPP=g++-14 static + cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos_intel - name: Caching produced project binary uses: actions/cache@v4 with: path: | - ${{ github.workspace }}/${{ matrix.projects.binary }}_macos13 - key: ${{ runner.os }}-macos13-${{ github.run_id }} + ${{ github.workspace }}/${{ matrix.projects.binary }}_macos_intel + key: ${{ runner.os }}-macos-intel-${{ github.run_id }} - name: Look at the generated binary run: | @@ -184,10 +184,10 @@ jobs: - name: Install dependencies run : | - if ! brew list gcc@13 &>/dev/null; then - brew install gcc@13 + if ! brew list gcc@14 &>/dev/null; then + brew install gcc@14 else - echo "gcc@13 is already installed." + echo "gcc@14 is already installed." fi - name: Build ${{ matrix.projects.name }} project @@ -196,15 +196,15 @@ jobs: make ${{ matrix.projects.project }} make clean ${{ matrix.projects.extra_run }} - make PHYSICELL_CPP=g++-13 static - cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macosm1 + make PHYSICELL_CPP=g++-14 static + cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos_arm - name: Caching produced project binary uses: actions/cache@v4 with: path: | - ${{ github.workspace }}/${{ matrix.projects.binary }}_macosm1 - key: ${{ runner.os }}-macosm1-${{ github.run_id }} + ${{ github.workspace }}/${{ matrix.projects.binary }}_macos_arm + key: ${{ runner.os }}-macos-arm-${{ github.run_id }} - name: Look at the generated binary run: | @@ -227,7 +227,7 @@ jobs: {short_name: "episode", project: "episode-sample", name: "PhysiCell Episode", binary: "project", extra_run: ""}, ] - runs-on: macos-13 + runs-on: macos-15-intel needs: [macos_step0a, macos_step0b] steps: @@ -237,20 +237,19 @@ jobs: uses: actions/cache@v4 with: path: | - ${{ github.workspace }}/${{ matrix.projects.binary }}_macosm1 - key: ${{ runner.os }}-macosm1-${{ github.run_id }} + ${{ github.workspace }}/${{ matrix.projects.binary }}_macos_arm + key: ${{ runner.os }}-macos-arm-${{ github.run_id }} - name: Caching produced project binary uses: actions/cache@v4 with: path: | - ${{ github.workspace }}/${{ matrix.projects.binary }}_macos13 - key: ${{ runner.os }}-macos13-${{ github.run_id }} + ${{ github.workspace }}/${{ matrix.projects.binary }}_macos_intel + key: ${{ runner.os }}-macos-intel-${{ github.run_id }} - name: Creating universal binary run: | - lipo -create -output ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos13 ${{ matrix.projects.binary }}_macosm1 - + lipo -create -output ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos_arm ${{ matrix.projects.binary }}_macos_intel - name: Checking universal binary run: | lipo -archs ${{ matrix.projects.binary }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index badff60f1..35b8a8b3e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,8 +13,8 @@ jobs: matrix: os: [ {name: "Ubuntu", os: "ubuntu-latest", shell: "bash", compiler: "g++"}, - {name: "MacOS 13", os: "macos-13", shell: "bash", compiler: "g++-12"}, - {name: "MacOS 14 (M1)", os: "macos-14", shell: "bash", compiler: "g++-13"}, + {name: "MacOS 15", os: "macos-15-intel", shell: "bash", compiler: "g++-14"}, + {name: "MacOS 14 (M1)", os: "macos-14", shell: "bash", compiler: "g++-14"}, {name: "Windows", os: "windows-latest", shell: "msys2", compiler: "g++"}, ] projects: [ From 87f3346e180b5a0ec8fe5d8589ae4be85b0df0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20No=C3=ABl?= Date: Wed, 17 Dec 2025 12:01:23 -0300 Subject: [PATCH 2/2] Including PR#366 from Daniel Co-authored-by: Daniel Bergman --- .github/workflows/build_binaries.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml index ef267578c..ac593c6c6 100644 --- a/.github/workflows/build_binaries.yml +++ b/.github/workflows/build_binaries.yml @@ -147,13 +147,13 @@ jobs: make clean ${{ matrix.projects.extra_run }} make PHYSICELL_CPP=g++-14 static - cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos_intel + cp ${{ matrix.projects.binary }} ${{ matrix.projects.short_name }}_macos_intel - name: Caching produced project binary uses: actions/cache@v4 with: path: | - ${{ github.workspace }}/${{ matrix.projects.binary }}_macos_intel + ${{ github.workspace }}/${{ matrix.projects.short_name }}_macos_intel key: ${{ runner.os }}-macos-intel-${{ github.run_id }} - name: Look at the generated binary @@ -197,13 +197,13 @@ jobs: make clean ${{ matrix.projects.extra_run }} make PHYSICELL_CPP=g++-14 static - cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos_arm + cp ${{ matrix.projects.binary }} ${{ matrix.projects.short_name }}_macos_arm - name: Caching produced project binary uses: actions/cache@v4 with: path: | - ${{ github.workspace }}/${{ matrix.projects.binary }}_macos_arm + ${{ github.workspace }}/${{ matrix.projects.short_name }}_macos_arm key: ${{ runner.os }}-macos-arm-${{ github.run_id }} - name: Look at the generated binary @@ -237,19 +237,19 @@ jobs: uses: actions/cache@v4 with: path: | - ${{ github.workspace }}/${{ matrix.projects.binary }}_macos_arm + ${{ github.workspace }}/${{ matrix.projects.short_name }}_macos_arm key: ${{ runner.os }}-macos-arm-${{ github.run_id }} - name: Caching produced project binary uses: actions/cache@v4 with: path: | - ${{ github.workspace }}/${{ matrix.projects.binary }}_macos_intel + ${{ github.workspace }}/${{ matrix.projects.short_name }}_macos_intel key: ${{ runner.os }}-macos-intel-${{ github.run_id }} - name: Creating universal binary run: | - lipo -create -output ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos_arm ${{ matrix.projects.binary }}_macos_intel + lipo -create -output ${{ matrix.projects.binary }} ${{ matrix.projects.short_name }}_macos_arm ${{ matrix.projects.short_name }}_macos_intel - name: Checking universal binary run: | lipo -archs ${{ matrix.projects.binary }}