Skip to content

Commit

Permalink
Combine two functionally equivalent rake-test jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
headius committed Nov 25, 2024
1 parent bc353eb commit aba7e88
Showing 1 changed file with 1 addition and 29 deletions.
30 changes: 1 addition & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
target: ['test:jruby:int', 'spec:ruby:fast', 'spec:ji', 'spec:ffi']
target: ['test:jruby:int', 'spec:ruby:fast', 'spec:ji', 'spec:ffi', 'test:mri:core:jit', 'test:mri:extra', 'spec:ruby:fast:jit', 'test:mri:stdlib', 'spec:ruby:slow', 'spec:ruby:debug', 'test:jruby:aot', 'test:slow_suites', 'spec:compiler', 'spec:regression', 'spec:jruby', 'spec:jrubyc', 'spec:profiler']
java-version: ['21', '23']
fail-fast: false

Expand All @@ -39,34 +39,6 @@ jobs:
- name: rake ${{ matrix.target }}
run: bin/jruby -S rake ${{ matrix.target }}

rake-test:
runs-on: ubuntu-latest

strategy:
matrix:
target: ['test:mri:core:jit', 'test:mri:extra', 'spec:ruby:fast:jit', 'test:mri:stdlib', 'spec:ruby:slow', 'spec:ruby:debug', 'test:jruby:aot', 'test:slow_suites', 'spec:compiler', 'spec:regression', 'spec:jruby', 'spec:jrubyc', 'spec:profiler']
fail-fast: false

name: rake ${{ matrix.target }} (Java 21)

steps:
- name: checkout
uses: actions/checkout@v3
- name: remove default java except 21
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
- name: set up java 21
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '21'
cache: 'maven'
- name: bootstrap
run: mvn -Pbootstrap clean package
- name: bundle install
run: bin/jruby --dev -S bundle install
- name: rake ${{ matrix.target }}
run: bin/jruby -S rake ${{ matrix.target }}

jruby-tests-dev:
runs-on: ubuntu-latest

Expand Down

0 comments on commit aba7e88

Please sign in to comment.