Test macOS-14 runners for ert

equinor · Apr 8, 2024 · 67cf5d5 · 67cf5d5
1 parent 7145a29
commit 67cf5d5
Showing 1 changed file with 32 additions and 11 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -117,30 +117,44 @@ jobs:
       python-version: ${{ matrix.python-version }}
 
   build-mac-for-tags:
-    if: github.ref_type == 'tag' # only build all variants for tags
+    #if: github.ref_type == 'tag' # only build all variants for tags
     strategy:
       fail-fast: false
       matrix:
         python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
-        os: [ 'macos-13', 'macos-latest-xlarge' ]
+        # https://github.com/actions/runner-images?tab=readme-ov-file#available-images
+        os: [ 'macos-13', 'macos-14', 'macos-14-large']
         exclude:
-          - os: 'macos-latest-xlarge'
+          - os: 'macos-14'
             python-version: '3.8'
-          - os: 'macos-latest-xlarge'
+          - os: 'macos-14'
             python-version: '3.9'
+          - os: 'macos-14'
+            python-version: '3.10'
+          - os: 'macos-14-large'
+            python-version: '3.8'
+          - os: 'macos-14-large'
+            python-version: '3.9'
+          - os: 'macos-14-large'
+            python-version: '3.10'
+          - os: 'macos-13'
+            python-version: '3.11'
+          - os: 'macos-13'
+            python-version: '3.12'
 
     uses: ./.github/workflows/build-wheels-macos.yml
     with:
       python-version: ${{ matrix.python-version }}
       os: ${{ matrix.os }}
 
   build-mac:
-    if: github.ref_type != 'tag' # one combination when not tag
+    #if: github.ref_type != 'tag' # one combination when not tag
+    if: github.ref_type == 'tag' # one combination when not tag
     strategy:
       fail-fast: false
       matrix:
         python-version: [ '3.12' ]
-        os: [ 'macos-latest' ]
+        os: [ 'macos-14' ]
     uses: ./.github/workflows/build-wheels-macos.yml
     with:
       python-version: ${{ matrix.python-version }}
@@ -173,32 +187,39 @@ jobs:
       python-version: ${{ matrix.python-version }}
 
   test-mac-for-tags:
-    if: github.ref_type == 'tag' # only test all variants for tags
+    #if: github.ref_type == 'tag' # only test all variants for tags
+    if: github.ref_type != 'tag' # only test all variants for tags
     needs: [build-mac-for-tags]
     strategy:
       fail-fast: false
       matrix:
         test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ]
         python-version: [ '3.8', '3.12' ]
-        os: [ 'macos-13', 'macos-latest-xlarge' ]
+        os: [ 'macos-13', 'macos-14', 'macos-14-large']
         exclude:
-          - os: 'macos-latest-xlarge'
+          - os: 'macos-14'
             python-version: '3.8'
+          - os: 'macos-14-large'
+            python-version: '3.8'
+          - os: 'macos-13'
+            python-version: '3.12'
+
     uses: ./.github/workflows/test_ert.yml
     with:
       os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}
       test-type: ${{ matrix.test-type }}
 
   test-mac:
-    if: github.ref_type != 'tag' # one combination when not tag
+    #if: github.ref_type != 'tag' # one combination when not tag
+    if: github.ref_type == 'tag' # one combination when not tag
     needs: [build-mac]
     strategy:
       fail-fast: false
       matrix:
         test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ]
         python-version: [ '3.12' ]
-        os: [ 'macos-latest' ]
+        os: [ 'macos-14' ]
     uses: ./.github/workflows/test_ert.yml
     with:
       os: ${{ matrix.os }}