Skip to content

Commit

Permalink
Add M1 macOS runner to some workflows
Browse files Browse the repository at this point in the history
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #23724)

(cherry picked from commit ada9d8c)
  • Loading branch information
quarckster authored and t8m committed Mar 22, 2024
1 parent df7166f commit 304ee5f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/os-zoo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-checker-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 304ee5f

Please sign in to comment.