From a199e6b765ddb578bdf07d53fc51ecc21d46e224 Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Mon, 24 Nov 2025 15:55:43 +0100 Subject: [PATCH 1/5] Use macos-latest in workflows instead of macos-14 --- .github/workflows/bundle_with_dakota_linux.yml | 2 +- .github/workflows/bundle_with_dakota_macos.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bundle_with_dakota_linux.yml b/.github/workflows/bundle_with_dakota_linux.yml index 9944da00..5340e76c 100644 --- a/.github/workflows/bundle_with_dakota_linux.yml +++ b/.github/workflows/bundle_with_dakota_linux.yml @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: python-version: [ '3.11', '3.12', '3.13' ] - os: [ ubuntu-24.04 ] + os: [ ubuntu-latest ] runs-on: ${{ matrix.os }} env: ERT_SHOW_BACKTRACE: ${{ inputs.ERT_SHOW_BACKTRACE }} diff --git a/.github/workflows/bundle_with_dakota_macos.yml b/.github/workflows/bundle_with_dakota_macos.yml index bca15dba..2eb26824 100644 --- a/.github/workflows/bundle_with_dakota_macos.yml +++ b/.github/workflows/bundle_with_dakota_macos.yml @@ -30,7 +30,7 @@ jobs: matrix: # https://github.com/actions/runner-images?tab=readme-ov-file#available-images python-version: [ '3.11', '3.12', '3.13'] - os: [ 'macos-14' ] + os: [ 'macos-latest' ] runs-on: ${{ matrix.os }} name: "Build 🛞 (${{ matrix.python-version }}, ${{ matrix.os }})" @@ -310,7 +310,7 @@ jobs: fail-fast: false matrix: python-version: [ '3.11', '3.12', '3.13'] - os: [ 'macos-14' ] + os: [ 'macos-latest' ] runs-on: ${{ matrix.os }} steps: From f46d8bb3f4367b8e522c389208a651eb8410b7ac Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Tue, 25 Nov 2025 09:48:16 +0100 Subject: [PATCH 2/5] Install cmake version 3.31.10 for macOS --- .github/workflows/bundle_with_dakota_macos.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bundle_with_dakota_macos.yml b/.github/workflows/bundle_with_dakota_macos.yml index 2eb26824..fe46e147 100644 --- a/.github/workflows/bundle_with_dakota_macos.yml +++ b/.github/workflows/bundle_with_dakota_macos.yml @@ -96,6 +96,7 @@ jobs: run: | python -m pip install -U pip python -m pip install numpy + python -m pip install cmake==3.31.10 - name: Build needed boost libraries if: steps.cache-package.outputs.cache-hit != 'true' @@ -167,7 +168,9 @@ jobs: mkdir -p build cd build - cmake \ + python -m cmake --version + + python -m cmake \ -DCMAKE_CXX_STANDARD=14 \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_CXX_FLAGS="-I$PYTHON_INCLUDE_DIR" \ From 9b7226aec5114abc36adbb4d214e81ae6ed13c8b Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Tue, 25 Nov 2025 10:23:00 +0100 Subject: [PATCH 3/5] Try building with gcc 13 --- .github/workflows/bundle_with_dakota_macos.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bundle_with_dakota_macos.yml b/.github/workflows/bundle_with_dakota_macos.yml index fe46e147..0a855a30 100644 --- a/.github/workflows/bundle_with_dakota_macos.yml +++ b/.github/workflows/bundle_with_dakota_macos.yml @@ -89,7 +89,7 @@ jobs: fetch-depth: 0 - name: Install brew gcc - run: brew install gcc + run: brew install gcc@13 - name: Install dependencies if: steps.cache-package.outputs.cache-hit != 'true' @@ -125,6 +125,9 @@ jobs: export PYTHON_EXECUTABLE=$(which python) export PYTHON_INCLUDE_DIR=$(python -c "from sysconfig import get_paths as gp; print(gp()['include'])") + python -m cmake --version + gcc --version + mkdir -p /tmp/build cd /tmp/build @@ -168,8 +171,6 @@ jobs: mkdir -p build cd build - python -m cmake --version - python -m cmake \ -DCMAKE_CXX_STANDARD=14 \ -DBUILD_SHARED_LIBS=ON \ From 1a4583fd33fd68ea050496e3bc16f1c6cbd27703 Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Tue, 25 Nov 2025 10:36:18 +0100 Subject: [PATCH 4/5] Limit mac testing some --- .github/workflows/bundle_with_dakota_macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bundle_with_dakota_macos.yml b/.github/workflows/bundle_with_dakota_macos.yml index 0a855a30..86c5215d 100644 --- a/.github/workflows/bundle_with_dakota_macos.yml +++ b/.github/workflows/bundle_with_dakota_macos.yml @@ -29,7 +29,7 @@ jobs: fail-fast: true matrix: # https://github.com/actions/runner-images?tab=readme-ov-file#available-images - python-version: [ '3.11', '3.12', '3.13'] + python-version: [ '3.11' ] os: [ 'macos-latest' ] runs-on: ${{ matrix.os }} @@ -313,7 +313,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ '3.11', '3.12', '3.13'] + python-version: [ '3.11' ] os: [ 'macos-latest' ] runs-on: ${{ matrix.os }} From e8cca921113bde82ee30a6b44c53adf1e726f48b Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Tue, 25 Nov 2025 10:36:35 +0100 Subject: [PATCH 5/5] Try to use clang@16 --- .github/workflows/bundle_with_dakota_macos.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/bundle_with_dakota_macos.yml b/.github/workflows/bundle_with_dakota_macos.yml index 86c5215d..60a9549b 100644 --- a/.github/workflows/bundle_with_dakota_macos.yml +++ b/.github/workflows/bundle_with_dakota_macos.yml @@ -91,6 +91,9 @@ jobs: - name: Install brew gcc run: brew install gcc@13 + - name: Install brew clang@16 + run: brew install llvm@16 + - name: Install dependencies if: steps.cache-package.outputs.cache-hit != 'true' run: | @@ -98,6 +101,18 @@ jobs: python -m pip install numpy python -m pip install cmake==3.31.10 + - name: Show deps + if: steps.cache-package.outputs.cache-hit != 'true' + run: | + echo "-------------------------------------------------" + python -m cmake --version + echo "-------------------------------------------------" + gcc --version + echo "-------------------------------------------------" + clang --version + echo "-------------------------------------------------" + return 1 + - name: Build needed boost libraries if: steps.cache-package.outputs.cache-hit != 'true' run: |