summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Misharov <dmitry@openssl.org>2024-03-01 16:59:07 +0100
committerTomas Mraz <tomas@openssl.org>2024-03-22 11:13:45 +0100
commit4b4cb314b578469365d049360b1ca2c7d898c6be (patch)
treed3ba6b9f125555ff17cc6745f88682f32b75cb9f
parentb7732a85415bba3f907d3280e1671bcc26794505 (diff)
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) (cherry picked from commit ada9d8c785cce8e75a88675622dd5ec79e9aa6d7)
-rw-r--r--.github/workflows/ci.yml12
1 files changed, 10 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e99dedf7c..8f6e0fb7fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -146,8 +146,12 @@ jobs:
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
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: config
@@ -310,7 +314,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