Skip to content

Commit

Permalink
Update Actions
Browse files Browse the repository at this point in the history
1. Remove rvm where possible, add ruby-head, misc
2. Add mingw & mswin Windows testing
  • Loading branch information
MSP-Greg committed Feb 12, 2020
1 parent ddfaed5 commit ccaeaea
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 69 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ on: [push, pull_request]
jobs:
build:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
ruby: [ 2.7, 2.4 ]
steps:
- uses: actions/checkout@master
- name: Install dependencies
run: |
gem install bundler --no-document
bundle install
- name: Run test
run: rake
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install dependencies
run: bundle install
- name: Run test
run: rake
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-jruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: Install libraries
run: sudo apt install haveged
- uses: actions/checkout@master
- uses: actions/checkout@v2
- name: Set up RVM
run: |
curl -sSL https://get.rvm.io | bash
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/ubuntu-rvm.yml

This file was deleted.

27 changes: 13 additions & 14 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,18 @@ jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
ruby: [ ruby-head, 2.7, 2.6, 2.5, 2.4 ]
steps:
- name: Install libraries
run: sudo apt install haveged
- uses: actions/checkout@master
- name: Set up Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install dependencies
run: |
gem install bundler --no-document
bundle install
- name: Run test
run: rake
- name: Install libraries
run: sudo apt install haveged
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install dependencies
run: bundle install
- name: Run test
run: rake
34 changes: 18 additions & 16 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
ruby: [ mingw, mswin, 2.7, 2.6, 2.5, 2.4 ]
steps:
- uses: actions/checkout@master
- name: Set up Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Update MSYS2
uses: MSP-Greg/msys2-action@master
with:
base: update
- name: Install dependencies
run: |
gem update --system --no-document --conservative
bundle install
- name: Run test
run: rake
- uses: actions/checkout@v2
- name: Set up Ruby
uses: MSP-Greg/actions-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
base: update
- name: Install dependencies
run: bundle install
- name: Run test
if: matrix.ruby != 'mswin'
run: rake
- name: Run test
if: matrix.ruby == 'mswin'
shell: cmd
run: |
call "%VCVARS%"
rake

0 comments on commit ccaeaea

Please sign in to comment.