From 2f4fecf7aa9b72661d66513cc8faf732cc31025e Mon Sep 17 00:00:00 2001 From: Nils Vu Date: Wed, 8 May 2024 20:57:53 -0700 Subject: [PATCH] Upgrade macOS CI workflow macos-11 is deprecated by GitHub. It's not supported by Homebrew anymore either, so fetching dependencies ran into issues. --- .github/workflows/Tests.yaml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Tests.yaml b/.github/workflows/Tests.yaml index 199fb5046782d..c4f65b4b82430 100644 --- a/.github/workflows/Tests.yaml +++ b/.github/workflows/Tests.yaml @@ -858,17 +858,15 @@ ${{ matrix.build_type }}-pch-${{ matrix.use_pch || 'ON' }}" # Build all test executables and run unit tests on macOS unit_tests_macos: name: Unit tests on macOS - runs-on: macos-13 + runs-on: macos-14 env: # We install some low-level dependencies with Homebrew. They get picked up # by `spack external find`. SPECTRE_BREW_DEPS: >- # Line breaks are spaces, no trailing newline - autoconf automake catch2 ccache cmake pkg-config boost + autoconf automake boost catch2 ccache cmake gsl hdf5 pkg-config # We install these packages with Spack and cache them. The full specs are - # listed in support/DevEnvironments/spack.yaml. This list is only needed - # to create the cache. - SPECTRE_SPACK_DEPS: >- - blaze charmpp gsl hdf5 libxsmm openblas yaml-cpp + # listed below. This list is only needed to create the cache. + SPECTRE_SPACK_DEPS: charmpp CCACHE_DIR: $HOME/ccache CCACHE_TEMPDIR: $HOME/ccache-tmp CCACHE_MAXSIZE: "2G" @@ -886,7 +884,7 @@ ${{ matrix.build_type }}-pch-${{ matrix.use_pch || 'ON' }}" uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - name: Install Homebrew dependencies run: | brew install $SPECTRE_BREW_DEPS @@ -904,7 +902,7 @@ ${{ matrix.build_type }}-pch-${{ matrix.use_pch || 'ON' }}" run: | cd $HOME git clone -c feature.manyFiles=true --depth=1 \ - --branch releases/v0.18 --single-branch \ + --branch releases/v0.22 --single-branch \ https://github.com/spack/spack.git - name: Configure Spack # - To avoid re-building packages that are already installed by Homebrew @@ -923,9 +921,9 @@ ${{ matrix.build_type }}-pch-${{ matrix.use_pch || 'ON' }}" - name: Install Spack dependencies run: | source $HOME/spack/share/spack/setup-env.sh - spack env create spectre support/DevEnvironments/spack.yaml + spack env create spectre spack env activate spectre - spack remove catch2 doxygen jemalloc boost + spack add charmpp@7.0.0 backend=multicore build-target=charm++ spack concretize --reuse spack install --no-check-signature spack find -v @@ -988,7 +986,7 @@ ${{ matrix.build_type }}-pch-${{ matrix.use_pch || 'ON' }}" -D OVERRIDE_ARCH=x86-64 \ -D BUILD_SHARED_LIBS=ON \ -D BUILD_PYTHON_BINDINGS=ON \ - -D BOOTSTRAP_PY_DEPS=ON \ + -D SPECTRE_FETCH_MISSING_DEPS=ON \ -D MEMORY_ALLOCATOR=SYSTEM \ -D CHARM_ROOT=$(spack location --install-dir charmpp) \ -D CMAKE_BUILD_TYPE=Debug \