From a0f449e5c8a6ce773c3c5f8d36bf7959e630714b Mon Sep 17 00:00:00 2001 From: Lukas Kluft Date: Wed, 3 Jul 2024 18:11:19 +0200 Subject: [PATCH] Fix CliMT build on MacOS --- .github/workflows/build-book.yml | 1 + .github/workflows/build-test.yml | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-book.yml b/.github/workflows/build-book.yml index a81f4fb..953c56c 100644 --- a/.github/workflows/build-book.yml +++ b/.github/workflows/build-book.yml @@ -19,6 +19,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install wheel + python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt TARGET=HASWELL python -m pip install .[docs] python -m pip list - name: build book diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 2d15ca2..12690c1 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -28,17 +28,26 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Install GCC (MacOS) + - name: Install CliMT (MacOS) if: matrix.name == 'macos' + env: + CC: gcc-12 + FC: gfortran-12 + TARGET: HASWELL run: | brew install gcc@12 - echo "CC=gcc-12" >> $GITHUB_ENV - echo "FC=gfortran-12" >> $GITHUB_ENV + python -m pip install --upgrade pip wheel + python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt - - name: Install + - name: Install CliMT (Linux) + if: matrix.name == 'ubuntu' run: | python -m pip install --upgrade pip wheel - TARGET=HASWELL python -m pip install -v .[docs,tests] + python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt + + - name: Install + run: | + python -m pip install -v .[docs,tests] python -m pip list - name: Lint with flake8