From: slontis <shane.lontis@oracle.com>
Date: Fri, 3 Oct 2025 02:00:35 +0000 (+1000)
Subject: Update CI macos runners
X-Git-Tag: 4.0-PRE-CLANG-FORMAT-WEBKIT~384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b77496a3626a96a6893f06010987d208e40107;p=thirdparty%2Fopenssl.git

Update CI macos runners

Github have notified that the macos 13 runner image is deprecated and
will be retired on the 4th December 2025. It will also fail temporarily
intermittently during November on specific days as a warning.

Notes:
 - The macos-14 and macos-15 labels correspond to arm64, and
   macos-14-large and macos-15-large correspond to x86_64 (intel).

 - macos x86_64 intel will no longer be supported after
   the macos 15 runner image is retired in the Fall of 2027.
   For now we should continue to support this.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28737)
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3b3ca497bba..7c87adf29ff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -266,7 +266,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14]
+        os: [macos-14, macos-14-large]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -578,7 +578,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14]
+        os: [macos-15, macos-15-large]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index 68f0c331ac4..1d20e55e879 100644
--- a/.github/workflows/os-zoo.yml
+++ b/.github/workflows/os-zoo.yml
@@ -104,7 +104,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14, macos-15]
+        os: [macos-14, macos-15, macos-15-large]
     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 fa7ff696832..f95303e1a6a 100644
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -335,7 +335,7 @@ jobs:
   enable_tfo:
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-13, macos-14 ]
+        os: [ ubuntu-latest, macos-15, macos-15-large ]
     runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v4