Skip to content

Commit

Permalink
Merge pull request #1563 from newrelic/jruby_9390
Browse files Browse the repository at this point in the history
  • Loading branch information
fallwith authored Oct 25, 2022
2 parents 98b2486 + ecb95eb commit 6db9870
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: [2.2.10, 3.1.2, jruby-9.3.8.0]
ruby-version: [2.2.10, 3.1.2, jruby-9.3.9.0]
steps:
- name: Configure git
run: 'git config --global init.defaultBranch main'
Expand Down Expand Up @@ -58,20 +58,20 @@ jobs:
"3.1.2": {
"rails": "norails,rails61,rails70"
},
"jruby-9.3.8.0": {
"jruby-9.3.9.0": {
"rails": "norails,rails61,rails52,rails42"
}
}
- if: matrix.ruby-version == '2.2.10' || matrix.ruby-version == 'jruby-9.3.8.0'
- if: matrix.ruby-version == '2.2.10' || matrix.ruby-version == 'jruby-9.3.9.0'
name: Cache mysql55
id: mysql55-cache
uses: john-shaffer/cache@sudo-tar
with:
path: /usr/local/mysql55
key: mysql55-install

- if: steps.mysql55-cache.outputs.cache-hit != 'true' && (matrix.ruby-version == '2.2.10' || matrix.ruby-version == 'jruby-9.3.8.0')
- if: steps.mysql55-cache.outputs.cache-hit != 'true' && (matrix.ruby-version == '2.2.10' || matrix.ruby-version == 'jruby-9.3.9.0')
name: Install mysql55
run: sudo ./test/script/install_mysql55

Expand Down Expand Up @@ -390,7 +390,7 @@ jobs:
- name: Install JRuby
uses: ruby/setup-ruby@v1
with:
ruby-version: jruby-9.3.8.0
ruby-version: jruby-9.3.9.0
env:
JAVA_HOME: /usr/lib/jvm/temurin-8-jdk-amd64

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: [2.2.10, 2.3.8, 2.4.10, 2.5.9, 2.6.10, 2.7.6, 3.0.4, 3.1.2, 3.2.0-preview2, jruby-9.3.8.0]
ruby-version: [2.2.10, 2.3.8, 2.4.10, 2.5.9, 2.6.10, 2.7.6, 3.0.4, 3.1.2, 3.2.0-preview2, jruby-9.3.9.0]

steps:
- name: Configure git
Expand Down Expand Up @@ -86,20 +86,20 @@ jobs:
"3.2.0-preview2": {
"rails": "norails,rails61,rails70,railsedge"
},
"jruby-9.3.8.0": {
"jruby-9.3.9.0": {
"rails": "norails,rails61,rails60,rails52,rails51,rails50,rails42"
}
}
- if: matrix.ruby-version == '2.2.10' || matrix.ruby-version == '2.3.8' || matrix.ruby-version == '2.4.10' || matrix.ruby-version == '2.5.9' || matrix.ruby-version == '2.6.10' || matrix.ruby-version == 'jruby-9.3.8.0'
- if: matrix.ruby-version == '2.2.10' || matrix.ruby-version == '2.3.8' || matrix.ruby-version == '2.4.10' || matrix.ruby-version == '2.5.9' || matrix.ruby-version == '2.6.10' || matrix.ruby-version == 'jruby-9.3.9.0'
name: Cache mysql55
id: mysql55-cache
uses: john-shaffer/cache@sudo-tar
with:
path: /usr/local/mysql55
key: mysql55-install

- if: steps.mysql55-cache.outputs.cache-hit != 'true' && ( matrix.ruby-version == '2.2.10' || matrix.ruby-version == '2.3.8' || matrix.ruby-version == '2.4.10' || matrix.ruby-version == '2.5.9' || matrix.ruby-version == '2.6.10' || matrix.ruby-version == 'jruby-9.3.8.0')
- if: steps.mysql55-cache.outputs.cache-hit != 'true' && ( matrix.ruby-version == '2.2.10' || matrix.ruby-version == '2.3.8' || matrix.ruby-version == '2.4.10' || matrix.ruby-version == '2.5.9' || matrix.ruby-version == '2.6.10' || matrix.ruby-version == 'jruby-9.3.9.0')
name: Install mysql55
run: sudo ./test/script/install_mysql55

Expand Down Expand Up @@ -379,7 +379,7 @@ jobs:
- name: Install JRuby
uses: ruby/setup-ruby@v1
with:
ruby-version: jruby-9.3.8.0
ruby-version: jruby-9.3.9.0
env:
JAVA_HOME: /usr/lib/jvm/temurin-8-jdk-amd64

Expand Down

0 comments on commit 6db9870

Please sign in to comment.