diff options
| author | Dmitry Misharov <dmitry@openssl.org> | 2024-03-01 16:59:07 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-03-22 11:08:24 +0100 |
| commit | 304ee5f22fa241a75ec9e0427bdd0ea0a654951e (patch) | |
| tree | 202ddd616153b98593db15ac01ca7e880bf78bf4 | |
| parent | df7166fa3aa85c1609c78b3ac5509889f0d44ae3 (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.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/os-zoo.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/run-checker-daily.yml | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d7c76551a..2c6dcd0767 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -179,8 +179,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: checkout fuzz/corpora submodule @@ -415,7 +419,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 cf06cd5c4d..fa5a46c27e 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 7c16b2f89d..a47ff930b1 100644 --- a/.github/workflows/run-checker-daily.yml +++ b/.github/workflows/run-checker-daily.yml @@ -312,7 +312,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 |