diff options
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/yjit-macos.yml | 8 |
3 files changed, 12 insertions, 11 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1480031bfa..698eed9b2a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3c312829a0..df74904a54 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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() }} diff --git a/.github/workflows/yjit-macos.yml b/.github/workflows/yjit-macos.yml index 6531737120..7c8a0c77d0 100644 --- a/.github/workflows/yjit-macos.yml +++ b/.github/workflows/yjit-macos.yml @@ -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 |