From 04726ca6979cf633fdd928b2910092da031a1ed7 Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Tue, 21 May 2024 12:12:14 +0200 Subject: [PATCH 1/3] Install gcc and gfortran using brew --- .github/workflows/bundle_with_dakota_macos.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/bundle_with_dakota_macos.yml b/.github/workflows/bundle_with_dakota_macos.yml index f043f16b..a8950ecc 100644 --- a/.github/workflows/bundle_with_dakota_macos.yml +++ b/.github/workflows/bundle_with_dakota_macos.yml @@ -88,6 +88,10 @@ jobs: key: ${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }} path: ${{ github.workspace }}/python-${{ matrix.python-version}}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}.tar.gz + - name: Install brew gcc + if: steps.cache-package.outputs.cache-hit != 'true' + run: brew install gcc + - name: Install dependencies if: steps.cache-package.outputs.cache-hit != 'true' run: | @@ -133,6 +137,9 @@ jobs: FORTRAN_PATH=$(dirname "$FORTRAN_FULLPATH") export PATH=$FORTRAN_PATH:$PATH + gcc --version + gfortran --version + tar xf dakota-${{ inputs.DAKOTA_VERSION }}-public-src-cli.tar.gz EIGEN_CMAKE_PATH=dakota-${{ inputs.DAKOTA_VERSION }}-public-src-cli/packages/external/eigen3/share/eigen3/cmake From 13b92143fa289843d6b05544a52e28c3d54f1808 Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Tue, 21 May 2024 12:48:40 +0200 Subject: [PATCH 2/3] Limit build & test impact --- .github/workflows/bundle_with_dakota_linux.yml | 2 +- .github/workflows/bundle_with_dakota_macos.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bundle_with_dakota_linux.yml b/.github/workflows/bundle_with_dakota_linux.yml index dc18bb04..cb8ad72a 100644 --- a/.github/workflows/bundle_with_dakota_linux.yml +++ b/.github/workflows/bundle_with_dakota_linux.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8','3.9','3.10','3.11','3.12'] + python-version: ['3.11'] os: [ubuntu-latest] runs-on: ${{ matrix.os }} env: diff --git a/.github/workflows/bundle_with_dakota_macos.yml b/.github/workflows/bundle_with_dakota_macos.yml index a8950ecc..63377b50 100644 --- a/.github/workflows/bundle_with_dakota_macos.yml +++ b/.github/workflows/bundle_with_dakota_macos.yml @@ -29,8 +29,8 @@ jobs: fail-fast: true matrix: # https://github.com/actions/runner-images?tab=readme-ov-file#available-images - python-version: [ '3.8', '3.11', '3.12' ] - os: [ 'macos-14', 'macos-14-large', 'macos-13' ] + python-version: [ '3.11' ] + os: [ 'macos-14' ] exclude: - os: 'macos-14' python-version: '3.8' @@ -308,8 +308,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ '3.8', '3.11', '3.12' ] - os: [ 'macos-14', 'macos-14-large', 'macos-13' ] + python-version: [ '3.11' ] + os: [ 'macos-14' ] exclude: - os: 'macos-14' python-version: '3.8' From 4e9351136a643353b79567635c65f2e5c2f9352e Mon Sep 17 00:00:00 2001 From: Andreas Eknes Lie Date: Tue, 21 May 2024 12:53:09 +0200 Subject: [PATCH 3/3] Propose boost 1.85.0 --- .github/workflows/bundle_with_dakota_caller.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bundle_with_dakota_caller.yml b/.github/workflows/bundle_with_dakota_caller.yml index 5dcf3940..5c237ebb 100644 --- a/.github/workflows/bundle_with_dakota_caller.yml +++ b/.github/workflows/bundle_with_dakota_caller.yml @@ -3,7 +3,7 @@ name: 🏎️ Make & Test Wheels 🏎️ env: ERT_SHOW_BACKTRACE: 1 NO_PROJECT_RES: 1 - BOOST_VERSION: 1.84.0 + BOOST_VERSION: 1.85.0 DAKOTA_VERSION: 6.19.0 INSTALL_DIR: local NEEDS_REBUILD: true