Skip to content

Commit

Permalink
Refresh our CI configuration (#895)
Browse files Browse the repository at this point in the history
* Better checks for jruby

These don't need updates on every jruby version bump.

* Bump tested versions in CI

* Switch to the official ruby action

* Fix bundler deprecations

* Remove bundler flag that's actually the default

* Aruba has been released
  • Loading branch information
deivid-rodriguez committed Jun 21, 2020
1 parent b5c961a commit 311d9db
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 21 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/stable.yml
Expand Up @@ -13,13 +13,13 @@ jobs:

strategy:
matrix:
ruby: [2.4.9, 2.5.7, 2.6.5, 2.7.0, jruby-9.2.9.0]
ruby: [2.4.10, 2.5.8, 2.6.6, 2.7.1, jruby-9.2.11.1]

steps:
- uses: actions/checkout@v2

- name: Setup ruby
uses: eregon/use-ruby-action@master
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}

Expand All @@ -30,12 +30,14 @@ jobs:
run: gem i bundler

- name: Install dependencies
run: bundle install --without benchmark --jobs=3 --retry=3
run: |
bundle config set --local without benchmark
bundle install --jobs=3
- name: Run tests (MRI)
run: bundle exec rake
if: matrix.ruby != 'jruby-9.2.9.0'
if: "!startsWith(matrix.ruby, 'jruby')"

- name: Run tests (JRuby)
run: JRUBY_OPTS=--debug bundle exec rake
if: matrix.ruby == 'jruby-9.2.9.0'
if: startsWith(matrix.ruby, 'jruby')
3 changes: 2 additions & 1 deletion .github/workflows/unstable.yml
Expand Up @@ -37,7 +37,8 @@ jobs:
- name: Install dependencies
run: |
source $HOME/.rvm/scripts/rvm
bundle install --without benchmark --jobs=3 --retry=3
bundle config set --local without benchmark
bundle install --jobs=3
- name: Run tests (MRI)
run: |
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -10,7 +10,7 @@ source "https://rubygems.org"

group :development do
gem "apparition", "0.5.0"
gem "aruba", github: "cucumber/aruba"
gem "aruba", "~> 1.0"
gem "capybara", "~> 3.31"
gem "cucumber", "~> 3.1"
gem "minitest"
Expand Down
23 changes: 9 additions & 14 deletions Gemfile.lock
@@ -1,15 +1,3 @@
GIT
remote: https://github.com/cucumber/aruba.git
revision: 8b7dc956daf47051237700488e8d866fb229db29
specs:
aruba (1.0.0.pre.alpha.5)
childprocess (~> 3.0)
contracts (~> 0.16.0)
cucumber (>= 2.4, < 4.0)
ffi (~> 1.9)
rspec-expectations (~> 3.4)
thor (~> 1.0)

PATH
remote: .
specs:
Expand All @@ -25,6 +13,13 @@ GEM
apparition (0.5.0)
capybara (~> 3.13, < 4)
websocket-driver (>= 0.6.5)
aruba (1.0.2)
childprocess (>= 2.0, < 5.0)
contracts (~> 0.16.0)
cucumber (>= 2.4, < 5.0)
ffi (~> 1.9)
rspec-expectations (~> 3.4)
thor (~> 1.0)
ast (2.4.0)
backports (3.15.0)
benchmark-ips (2.7.2)
Expand All @@ -37,7 +32,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
childprocess (4.0.0)
coderay (1.1.2)
contracts (0.16.0)
cucumber (3.1.2)
Expand Down Expand Up @@ -132,7 +127,7 @@ PLATFORMS

DEPENDENCIES
apparition (= 0.5.0)
aruba!
aruba (~> 1.0)
benchmark-ips
capybara (~> 3.31)
cucumber (~> 3.1)
Expand Down

0 comments on commit 311d9db

Please sign in to comment.