Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use ruby/setup-ruby to simplify CI #335

Merged
merged 2 commits into from
Feb 6, 2020
Merged

Use ruby/setup-ruby to simplify CI #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dd9db0
Improve version check in test_rake_clean.rb
eregon Feb 6, 2020
9e83d30
Use ruby/setup-ruby to simplify CI
eregon Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
ruby: [ 2.6, 2.5, 2.4 ]
steps:
- uses: actions/checkout@master
- name: Set up Ruby
uses: actions/setup-ruby@v1
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install dependencies
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/ubuntu-rvm.yml
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
ruby: [ 2.6, 2.5, 2.4, 2.3, 2.2, jruby, truffleruby, ruby-head ]
steps:
- uses: actions/checkout@master
- name: Set up Ruby
uses: actions/setup-ruby@v1
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install dependencies
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
ruby: [ 2.6, 2.5, 2.4 ]
steps:
- uses: actions/checkout@master
- name: Set up Ruby
uses: actions/setup-ruby@v1
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion test/test_rake_clean.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class TestRakeClean < Rake::TestCase # :nodoc:
def test_clean
if RUBY_ENGINE == 'truffleruby' and RUBY_ENGINE_VERSION == '19.3.0'
if RUBY_ENGINE == 'truffleruby' and RUBY_ENGINE_VERSION.start_with?('19.3.')
load "rake/clean.rb" # TruffleRuby 19.3 does not set self correctly with wrap=true
else
load "rake/clean.rb", true
Expand Down