Avoid macos-11 / Python 3.10 which seems to consistently fail.

Add macos-11 / Python 3.12 instead
McStasMcXtrace · May 2, 2024 · 281484e · 281484e
1 parent 6679f7a
commit 281484e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml
@@ -23,10 +23,10 @@ jobs:
           - { os: ubuntu-22.04, CC: gcc,      CXX: g++,        python: '3.10' }
           - { os: ubuntu-22.04, CC: clang,    CXX: clang++,    python: '3.11' }
           - { os: ubuntu-22.04, CC: gcc-12,   CXX: g++-12,     python: '3.11' }
-          - { os: macos-11,      CC: clang,    CXX: clang++,    python: "3.10" }
           - { os: macos-12,      CC: clang,    CXX: clang++,    python: "3.11" }
           - { os: macos-13,      CC: clang,    CXX: clang++,    python: "3.11" }
-          - { os: windows-latest,  CC: gcc,    CXX: g++,        python: "3.11" }
+          - { os: macos-14,      CC: clang,    CXX: clang++,    python: "3.12" }
+  - { os: windows-latest,  CC: gcc,    CXX: g++,        python: "3.11" }
 
     name: ${{ matrix.os }}.${{ matrix.CC }}.python-${{ matrix.python }}
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/mcstas-testsuite.yml b/.github/workflows/mcstas-testsuite.yml
@@ -15,8 +15,6 @@ jobs:
       matrix:
         include:
           - { os: ubuntu-latest, CC: clang,    CXX: clang++,    python: '3.11' }
-          # Drop macOS, takes much too long time executing
-          # - { os: macos-13,      CC: clang,    CXX: clang++,     python: "3.11" }
 
     name: ${{ matrix.os }}.${{ matrix.CC }}.python-${{ matrix.python }}
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml
@@ -23,9 +23,9 @@ jobs:
           - { os: ubuntu-22.04, CC: gcc,      CXX: g++,        python: '3.10' }
           - { os: ubuntu-22.04, CC: clang,    CXX: clang++,    python: '3.11' }
           - { os: ubuntu-22.04, CC: gcc-12,   CXX: g++-12,     python: '3.11' }
-          - { os: macos-11,      CC: clang,    CXX: clang++,    python: "3.10" }
           - { os: macos-12,      CC: clang,    CXX: clang++,    python: "3.11" }
           - { os: macos-13,      CC: clang,    CXX: clang++,    python: "3.11" }
+          - { os: macos-14,      CC: clang,    CXX: clang++,    python: "3.12" }
           - { os: windows-latest,  CC: gcc,    CXX: g++,        python: "3.11" }
 
     name: ${{ matrix.os }}.${{ matrix.CC }}.python-${{ matrix.python }}