Build wheels for x86_64, intel and apple macOS

Focus testing mostly on python 3.8, 3.11, 3.12 See table overview; equinor#7204 (comment)
andreas-el · Feb 20, 2024 · cbab164 · cbab164
1 parent d628948
commit cbab164
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest-xlarge']
+        os: ['ubuntu-latest', 'macos-13', 'macos-latest-xlarge']
 
     runs-on: ${{ matrix.os }}
 
@@ -93,8 +93,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.10', '3.11', '3.12' ]
-        os: [ 'macos-latest-xlarge' ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
+        os: [ 'macos-13', 'macos-latest-xlarge' ]
+        exclude:
+          - os: 'macos-latest-xlarge'
+            python-version: '3.8'
+          - os: 'macos-latest-xlarge'
+            python-version: '3.9'
 
     uses: ./.github/workflows/build-wheels-macos.yml
     with:
@@ -107,15 +112,9 @@ jobs:
       fail-fast: false
       matrix:
         test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ]
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.8', '3.11', '3.12' ]
         os: [ ubuntu-latest ]
         exclude:
-          - os: ubuntu-latest
-            python-version: '3.9'
-            test-type: 'gui-test'
-          - os: ubuntu-latest
-            python-version: '3.10'
-            test-type: 'gui-test'
           - os: ubuntu-latest
             python-version: '3.11'
             test-type: 'gui-test'
@@ -131,7 +130,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.8', '3.11', '3.12' ]
     uses: ./.github/workflows/test_ert_with_slurm.yml
     with:
       os: ${{ matrix.os }}
@@ -143,8 +142,13 @@ jobs:
       fail-fast: false
       matrix:
         test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ]
-        python-version: [ '3.10', '3.11', '3.12' ]
-        os: [ 'macos-latest-xlarge' ]
+        python-version: [ '3.8', '3.10', '3.11', '3.12' ]
+        os: [ 'macos-13', 'macos-latest-xlarge' ]
+        exclude:
+          - os: 'macos-13'
+            python-version: '3.10'
+          - os: 'macos-latest-xlarge'
+            python-version: '3.8'
     uses: ./.github/workflows/test_ert.yml
     with:
       os: ${{ matrix.os }}

diff --git a/.github/workflows/run_ert_test_data_setups.yml b/.github/workflows/run_ert_test_data_setups.yml
@@ -21,8 +21,12 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.8', '3.10', '3.11', '3.12']
-        os: [ubuntu-latest, macos-latest-xlarge]
+        os: [ubuntu-latest, macos-13, macos-latest-xlarge]
         exclude:
+        - python-version: '3.10'
+          os: ubuntu-latest
+        - python-version: '3.10'
+          os: macos-13
         - python-version: '3.8'
           os: macos-latest-xlarge