From ada9d8c785cce8e75a88675622dd5ec79e9aa6d7 Mon Sep 17 00:00:00 2001 From: Dmitry Misharov Date: Fri, 1 Mar 2024 16:59:07 +0100 Subject: Add M1 macOS runner to some workflows Reviewed-by: Shane Lontis Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/23724) --- .github/workflows/ci.yml | 12 ++++++++++-- .github/workflows/os-zoo.yml | 2 +- .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 ae784cdb84..019331b471 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 64a8fd33ce..8bd0107883 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 5ad006e269..486d50dc7d 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 -- cgit v1.2.3