From f862cdd00f459224f74b588292bc088b16691c53 Mon Sep 17 00:00:00 2001 From: Igor Krivenko Date: Tue, 23 Jan 2024 12:06:06 +0100 Subject: [PATCH] [CI] Switch to macOS-12 --- .github/workflows/build-and-test-macos.yml | 18 +++++++++++------- .github/workflows/build-and-test-ubuntu.yml | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml index d448088b..c0f8af64 100644 --- a/.github/workflows/build-and-test-macos.yml +++ b/.github/workflows/build-and-test-macos.yml @@ -11,13 +11,15 @@ on: jobs: build-and-test: - runs-on: macos-11 + runs-on: macos-12 strategy: matrix: compiler: - - { name: "g++-10", cxx: "g++-10" } - - { name: "clang", cxx: "clang++" } - install-libcommute: [true, false] + - { name: "g++-11", cxx: "g++-11" } + install-libcommute: [false] + # FIXME + #- { name: "clang", cxx: "clang++" } + #install-libcommute: [true, false] steps: - uses: actions/checkout@v3 @@ -82,10 +84,12 @@ jobs: env: TMPDIR: "/tmp" run: | - echo -e "\nrmaps_base_oversubscribe = 1" >> \ - /usr/local/etc/openmpi-mca-params.conf + mkdir -p $HOME/.prte + echo -e "\nrmaps_default_mapping_policy = :oversubscribe" >> \ + $HOME/.prte/mca-params.conf + cat $HOME/.prte/mca-params.conf cd build - CTEST_OUTPUT_ON_FAILURE=1 make test + ctest --output-on-failure - name: Install run: | diff --git a/.github/workflows/build-and-test-ubuntu.yml b/.github/workflows/build-and-test-ubuntu.yml index 0044b4a4..621948f2 100644 --- a/.github/workflows/build-and-test-ubuntu.yml +++ b/.github/workflows/build-and-test-ubuntu.yml @@ -84,7 +84,7 @@ jobs: sudo sh -c 'echo -e "\nrmaps_base_oversubscribe = 1" >> \ /etc/openmpi/openmpi-mca-params.conf' cd build - CTEST_OUTPUT_ON_FAILURE=1 make test + ctest --output-on-failure - name: Install run: |