From 76a03682ea6882bcc75b566a431081d09abce9e1 Mon Sep 17 00:00:00 2001 From: bue Date: Mon, 3 Feb 2025 15:04:10 -0500 Subject: [PATCH 1/3] @ workflow : clean out msys2 package list and update brew gcc to v14. --- .github/workflows/build_binaries.yml | 18 +++++++++--------- .github/workflows/tests.yml | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml index cd0e5b943..8bb9545a4 100644 --- a/.github/workflows/build_binaries.yml +++ b/.github/workflows/build_binaries.yml @@ -82,7 +82,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: update: true - install: mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc mingw-w64-x86_64-headers-git mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-lapack mingw-w64-x86_64-openblas mingw-w64-x86_64-libxml2 mingw-w64-x86_64-bzip2 mingw-w64-x86_64-python mingw-w64-x86_64-python-zstandard mingw-w64-x86_64-python-cffi make bison flex mingw-w64-x86_64-ca-certificates + install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ffmpeg unzip zip git mingw-w64-x86_64-python-zstandard mingw-w64-x86_64-ca-certificates - name: Build ${{ matrix.projects.name }} project run: | @@ -134,10 +134,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 @@ -146,7 +146,7 @@ jobs: make ${{ matrix.projects.project }} make clean ${{ matrix.projects.extra_run }} - make PHYSICELL_CPP=g++-13 static + make PHYSICELL_CPP=g++-14 static cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos13 - name: Caching produced project binary @@ -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,7 +196,7 @@ jobs: make ${{ matrix.projects.project }} make clean ${{ matrix.projects.extra_run }} - make PHYSICELL_CPP=g++-13 static + make PHYSICELL_CPP=g++-14 static cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macosm1 - name: Caching produced project binary diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index badff60f1..3347b12d3 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 13", os: "macos-13", 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: [ @@ -52,8 +52,8 @@ jobs: uses: msys2/setup-msys2@v2 with: update: true - install: mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc mingw-w64-x86_64-headers-git mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-lapack mingw-w64-x86_64-openblas mingw-w64-x86_64-libxml2 mingw-w64-x86_64-bzip2 mingw-w64-x86_64-python mingw-w64-x86_64-python-zstandard mingw-w64-x86_64-python-cffi make bison flex mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-diffutils - + install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ffmpeg unzip zip git mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-diffutils + - name: Build ${{ matrix.projects.name }} project run: | make data-cleanup && make ${{ matrix.projects.project }} && make PHYSICELL_CPP=${{ matrix.os.compiler }} PROGRAM_NAME=${{ matrix.projects.binary }} From 223fbf08bfedadfe4be115353513dc6df0de2b8b Mon Sep 17 00:00:00 2001 From: bue Date: Tue, 4 Feb 2025 22:02:05 -0500 Subject: [PATCH 2/3] @ make msys2 package list ucrt (universal c runtime) specific, which is the recommended standard. --- .github/workflows/build_binaries.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml index 8bb9545a4..aecc47a52 100644 --- a/.github/workflows/build_binaries.yml +++ b/.github/workflows/build_binaries.yml @@ -82,7 +82,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: update: true - install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ffmpeg unzip zip git mingw-w64-x86_64-python-zstandard mingw-w64-x86_64-ca-certificates + install: mingw-w64-ucrt-x86_64-gcc make mingw-w64-ucrt-x86_64-imagemagick mingw-w64-ucrt-x86_64-ffmpeg unzip zip git mingw-w64-ucrt-x86_64-python-zstandard mingw-w64-ucrt-x86_64-ca-certificates - name: Build ${{ matrix.projects.name }} project run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3347b12d3..77b03ffc4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,7 +52,7 @@ jobs: uses: msys2/setup-msys2@v2 with: update: true - install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ffmpeg unzip zip git mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-diffutils + install: mingw-w64-ucrt-x86_64-gcc make mingw-w64-ucrt-x86_64-imagemagick mingw-w64-ucrt-x86_64-ffmpeg unzip zip git mingw-w64-ucrt-x86_64-ca-certificates mingw-w64-ucrt-x86_64-diffutils - name: Build ${{ matrix.projects.name }} project run: | From 923b795ba61c2e18d3a9b76fe7cf6ba1bb0bd397 Mon Sep 17 00:00:00 2001 From: bue Date: Tue, 4 Feb 2025 22:34:22 -0500 Subject: [PATCH 3/3] revert ucrt specificity. --- .github/workflows/build_binaries.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml index aecc47a52..8bb9545a4 100644 --- a/.github/workflows/build_binaries.yml +++ b/.github/workflows/build_binaries.yml @@ -82,7 +82,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: update: true - install: mingw-w64-ucrt-x86_64-gcc make mingw-w64-ucrt-x86_64-imagemagick mingw-w64-ucrt-x86_64-ffmpeg unzip zip git mingw-w64-ucrt-x86_64-python-zstandard mingw-w64-ucrt-x86_64-ca-certificates + install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ffmpeg unzip zip git mingw-w64-x86_64-python-zstandard mingw-w64-x86_64-ca-certificates - name: Build ${{ matrix.projects.name }} project run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 77b03ffc4..3347b12d3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,7 +52,7 @@ jobs: uses: msys2/setup-msys2@v2 with: update: true - install: mingw-w64-ucrt-x86_64-gcc make mingw-w64-ucrt-x86_64-imagemagick mingw-w64-ucrt-x86_64-ffmpeg unzip zip git mingw-w64-ucrt-x86_64-ca-certificates mingw-w64-ucrt-x86_64-diffutils + install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ffmpeg unzip zip git mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-diffutils - name: Build ${{ matrix.projects.name }} project run: |