]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Add M1 macOS runner to some workflows
authorDmitry Misharov <dmitry@openssl.org>
Fri, 1 Mar 2024 15:59:07 +0000 (16:59 +0100)
committerTomas Mraz <tomas@openssl.org>
Fri, 22 Mar 2024 10:07:33 +0000 (11:07 +0100)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23724)

(cherry picked from commit ada9d8c785cce8e75a88675622dd5ec79e9aa6d7)

.github/workflows/ci.yml
.github/workflows/os-zoo.yml
.github/workflows/run-checker-daily.yml

index 5dd5138a6a97d37a8176043b305aad16727b29dc..39be0bea763a7f8bdef9b2e7605a1be20bbe5fca 100644 (file)
@@ -213,8 +213,12 @@ jobs:
         path: artifacts/
 
   no-shared-macos:
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-13, macos-14]
     if: github.server_url == 'https://github.com'
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
@@ -511,7 +515,11 @@ jobs:
       working-directory: ./build
 
   out-of-readonly-source-and-install-macos:
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-13, macos-14]
+    runs-on: ${{ matrix.os }}
     if: github.server_url == 'https://github.com'
     steps:
     - uses: actions/checkout@v4
index 4a6c8e74d1a3ab9fd7fcc8708b8540ec742e8d25..cd16a778ab5c8aa93eac8d4ab53c0276b0defe40 100644 (file)
@@ -105,7 +105,7 @@ jobs:
       fail-fast: false
       matrix:
         branch: [openssl-3.0, openssl-3.1, master]
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-11, macos-12, macos-13, macos-14]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
index be86059013a5ce06f93cadf575e1d1951ee50a7c..abd663c03ed16c9c1dc852593e7b62516c1704de 100644 (file)
@@ -313,7 +313,7 @@ jobs:
   enable_tfo:
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-13, macos-14 ]
     runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v4