From: Dmitry Misharov <dmitry@openssl.org>
Date: Fri, 1 Mar 2024 15:59:07 +0000 (+0100)
Subject: Add M1 macOS runner to some workflows
X-Git-Tag: openssl-3.4.0-alpha1~807
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ada9d8c785cce8e75a88675622dd5ec79e9aa6d7;p=thirdparty%2Fopenssl.git

Add M1 macOS runner to some workflows

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23724)
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae784cdb846..019331b471a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index 64a8fd33ce8..8bd01078838 100644
--- a/.github/workflows/os-zoo.yml
+++ b/.github/workflows/os-zoo.yml
@@ -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
diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml
index 5ad006e2692..486d50dc7d6 100644
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -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