Use macos-14 instead of macos-arm-oss
Unfortunately, we can't use macos-arm-oss with enterprise account
This commit is contained in:
parent
bbb4da78c7
commit
3b48a5a11c
5
.github/workflows/codeql-analysis.yml
vendored
5
.github/workflows/codeql-analysis.yml
vendored
@ -32,7 +32,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze
|
||||
runs-on: ${{ matrix.os }}
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
actions: read # for github/codeql-action/init to get workflow details
|
||||
contents: read # for actions/checkout to fetch code
|
||||
@ -56,10 +56,7 @@ jobs:
|
||||
matrix:
|
||||
include:
|
||||
- language: cpp
|
||||
os: ubuntu-latest
|
||||
# ruby analysis used large memory. We need to use a larger runner.
|
||||
- language: ruby
|
||||
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'ubuntu-latest' }}
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
|
10
.github/workflows/macos.yml
vendored
10
.github/workflows/macos.yml
vendored
@ -26,10 +26,14 @@ jobs:
|
||||
matrix:
|
||||
include:
|
||||
- test_task: check
|
||||
os: macos-14
|
||||
- test_task: test-all
|
||||
test_opts: --repeat-count=2
|
||||
os: macos-14
|
||||
- test_task: test-bundler-parallel
|
||||
os: macos-14
|
||||
- test_task: test-bundled-gems
|
||||
os: macos-14
|
||||
- test_task: check
|
||||
os: macos-12
|
||||
- test_task: check
|
||||
@ -39,7 +43,7 @@ jobs:
|
||||
env:
|
||||
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
|
||||
|
||||
runs-on: ${{ matrix.os || (github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14') }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
if: >-
|
||||
${{!(false
|
||||
@ -94,7 +98,7 @@ jobs:
|
||||
- name: Set up Launchable
|
||||
uses: ./.github/actions/launchable/setup
|
||||
with:
|
||||
os: ${{ matrix.os || (github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14') }}
|
||||
os: ${{ matrix.os }}
|
||||
test-opts: ${{ matrix.test_opts }}
|
||||
launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
|
||||
builddir: build
|
||||
@ -129,7 +133,7 @@ jobs:
|
||||
|
||||
- uses: ./.github/actions/slack
|
||||
with:
|
||||
label: ${{ matrix.os || (github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14') }} / ${{ matrix.test_task }}
|
||||
label: ${{ matrix.os }} / ${{ matrix.test_task }}
|
||||
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
|
||||
if: ${{ failure() }}
|
||||
|
||||
|
8
.github/workflows/yjit-macos.yml
vendored
8
.github/workflows/yjit-macos.yml
vendored
@ -24,7 +24,7 @@ jobs:
|
||||
cargo:
|
||||
name: cargo test
|
||||
|
||||
runs-on: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||
runs-on: macos-14
|
||||
|
||||
if: >-
|
||||
${{!(false
|
||||
@ -68,7 +68,7 @@ jobs:
|
||||
RUN_OPTS: ${{ matrix.yjit_opts }}
|
||||
SPECOPTS: ${{ matrix.specopts }}
|
||||
|
||||
runs-on: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||
runs-on: macos-14
|
||||
|
||||
if: >-
|
||||
${{!(false
|
||||
@ -119,7 +119,7 @@ jobs:
|
||||
- name: Set up Launchable
|
||||
uses: ./.github/actions/launchable/setup
|
||||
with:
|
||||
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||
os: macos-14
|
||||
test-opts: ${{ matrix.configure }}
|
||||
launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
|
||||
builddir: build
|
||||
@ -158,7 +158,7 @@ jobs:
|
||||
result:
|
||||
if: ${{ always() }}
|
||||
name: ${{ github.workflow }} result
|
||||
runs-on: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||
runs-on: macos-14
|
||||
needs: [make]
|
||||
steps:
|
||||
- run: exit 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user