diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2024-02-22 15:15:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-22 23:15:03 +0000 |
| commit | cdca94208f18b0921340906a1cb43f88737539e2 (patch) | |
| tree | 65adadbbef97bedcf358a620f6f185f956fab58d /.github | |
| parent | bccf4b30fa251dd4394d4ad477bad53c624d2aba (diff) | |
Fallback every macos-arm-oss usage to macos-14 (#10074)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/yjit-macos.yml | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c698f85ecb..dbb94baae1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,8 +39,7 @@ jobs: 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. if: >- - ${{github.repository == 'ruby/ruby' && - !(false + ${{!(false || contains(github.event.head_commit.message, '[DOC]') || contains(github.event.pull_request.title, '[DOC]') || contains(github.event.pull_request.labels.*.name, 'Documentation') @@ -58,14 +57,14 @@ jobs: os: ubuntu-latest # ruby analysis used large memory. We need to use a larger runner. - language: ruby - os: macos-arm-oss + os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }} steps: - name: Checkout repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Install libraries - if: ${{ matrix.os == 'macos-arm-oss' }} + if: ${{ contains(matrix.os, 'macos') }} uses: ./.github/actions/setup/macos - name: Install libraries diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index eb56f1c9bf..1f2b4ef585 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -25,12 +25,15 @@ jobs: strategy: matrix: 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: - 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 - os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-13' }} + os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }} fail-fast: false env: diff --git a/.github/workflows/yjit-macos.yml b/.github/workflows/yjit-macos.yml index c2a6ca04f0..de585e558d 100644 --- a/.github/workflows/yjit-macos.yml +++ b/.github/workflows/yjit-macos.yml @@ -24,11 +24,10 @@ jobs: cargo: name: cargo test - runs-on: macos-arm-oss + runs-on: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }} if: >- - ${{github.repository == 'ruby/ruby' && - !(false + ${{!(false || contains(github.event.head_commit.message, '[DOC]') || contains(github.event.pull_request.title, '[DOC]') || contains(github.event.pull_request.labels.*.name, 'Documentation') |