Fallback every macos-arm-oss usage to macos-14 (#10074)
This commit is contained in:
parent
bccf4b30fa
commit
cdca94208f
7
.github/workflows/codeql-analysis.yml
vendored
7
.github/workflows/codeql-analysis.yml
vendored
@ -39,8 +39,7 @@ jobs:
|
|||||||
security-events: write # for github/codeql-action/autobuild to send a status report
|
security-events: write # for github/codeql-action/autobuild to send a status report
|
||||||
# CodeQL fails to run pull requests from dependabot due to missing write access to upload results.
|
# CodeQL fails to run pull requests from dependabot due to missing write access to upload results.
|
||||||
if: >-
|
if: >-
|
||||||
${{github.repository == 'ruby/ruby' &&
|
${{!(false
|
||||||
!(false
|
|
||||||
|| contains(github.event.head_commit.message, '[DOC]')
|
|| contains(github.event.head_commit.message, '[DOC]')
|
||||||
|| contains(github.event.pull_request.title, '[DOC]')
|
|| contains(github.event.pull_request.title, '[DOC]')
|
||||||
|| contains(github.event.pull_request.labels.*.name, 'Documentation')
|
|| contains(github.event.pull_request.labels.*.name, 'Documentation')
|
||||||
@ -58,14 +57,14 @@ jobs:
|
|||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
# ruby analysis used large memory. We need to use a larger runner.
|
# ruby analysis used large memory. We need to use a larger runner.
|
||||||
- language: ruby
|
- language: ruby
|
||||||
os: macos-arm-oss
|
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||||
|
|
||||||
- name: Install libraries
|
- name: Install libraries
|
||||||
if: ${{ matrix.os == 'macos-arm-oss' }}
|
if: ${{ contains(matrix.os, 'macos') }}
|
||||||
uses: ./.github/actions/setup/macos
|
uses: ./.github/actions/setup/macos
|
||||||
|
|
||||||
- name: Install libraries
|
- name: Install libraries
|
||||||
|
9
.github/workflows/macos.yml
vendored
9
.github/workflows/macos.yml
vendored
@ -25,12 +25,15 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
test_task: ['check']
|
test_task: ['check']
|
||||||
os: ${{ fromJSON(format('["macos-12","macos-13"{0}]', (github.repository == 'ruby/ruby' && ',"macos-arm-oss"' || ''))) }}
|
os:
|
||||||
|
- macos-12
|
||||||
|
- macos-13
|
||||||
|
- ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||||
include:
|
include:
|
||||||
- test_task: test-all TESTS=--repeat-count=2
|
- test_task: test-all TESTS=--repeat-count=2
|
||||||
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-13' }}
|
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||||
- test_task: test-bundled-gems
|
- test_task: test-bundled-gems
|
||||||
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-13' }}
|
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
5
.github/workflows/yjit-macos.yml
vendored
5
.github/workflows/yjit-macos.yml
vendored
@ -24,11 +24,10 @@ jobs:
|
|||||||
cargo:
|
cargo:
|
||||||
name: cargo test
|
name: cargo test
|
||||||
|
|
||||||
runs-on: macos-arm-oss
|
runs-on: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||||
|
|
||||||
if: >-
|
if: >-
|
||||||
${{github.repository == 'ruby/ruby' &&
|
${{!(false
|
||||||
!(false
|
|
||||||
|| contains(github.event.head_commit.message, '[DOC]')
|
|| contains(github.event.head_commit.message, '[DOC]')
|
||||||
|| contains(github.event.pull_request.title, '[DOC]')
|
|| contains(github.event.pull_request.title, '[DOC]')
|
||||||
|| contains(github.event.pull_request.labels.*.name, 'Documentation')
|
|| contains(github.event.pull_request.labels.*.name, 'Documentation')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user