simplify ci (#844)

* simplify ci

* use spinach without json

.github/workflows/test.yml

@@ -2,16 +2,14 @@ name: test
 
 on:
   push:
-    branches:
-      - master
-
+    branches: [master]
   pull_request:
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: false # run all tests so we see which gem/ruby combinations break
       matrix:
         ruby: ['3.0', '2.7', head, jruby-head]
         os: [ubuntu-latest, windows-latest]
@@ -20,21 +18,14 @@ jobs:
         - ruby: '2.7' # lowest supported version
           os: ubuntu-latest
           task: rubocop
-    env:
-      RUBYOPT: -W0
-      # avoid warnings from https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
-      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     steps:
     - uses: actions/checkout@master
-    - name: Setup OS dependencies
-      uses: MSP-Greg/setup-ruby-pkgs@v1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        apt-get:  libsqlite3-dev
-    - name: Install dependencies
-      run: bundle install --jobs 4
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: rake ${{ matrix.task }}
-      run: bundle exec rake ${{ matrix.task }}
       # allow ruby/jruby-head to fail since they are moving targets
       # TODO: this will always show green, fix once https://github.com/actions/toolkit/issues/399 is resolved
       continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+      run: bundle exec rake ${{ matrix.task }}

Gemfile

@@ -8,6 +8,6 @@ gem 'minitest', '~> 5.5.0'
 gem 'rspec', '~> 3.3'
 gem 'cucumber', "~> 4.0"
 gem 'cuke_modeler', '~> 3.0'
-gem 'spinach'
+gem 'spinach', git: "https://github.com/grosser/spinach.git", branch: "grosser/json" # https://github.com/codegram/spinach/pull/229
 gem 'rake'
 gem 'rubocop'

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/grosser/spinach.git
+  revision: e4e08ffd6d0877d139d602f3f5ccba3c97d69a36
+  branch: grosser/json
+  specs:
+    spinach (0.11.0)
+      colorize
+      gherkin-ruby (>= 0.3.2)
+
 PATH
   remote: .
   specs:
@@ -55,7 +64,6 @@ GEM
     gherkin-ruby (0.3.2)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
     middleware (0.1.0)
     minitest (5.5.1)
     multi_test (0.1.2)
@@ -97,10 +105,6 @@ GEM
     rubocop-ast (1.16.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    spinach (0.11.0)
-      colorize
-      gherkin-ruby (>= 0.3.2)
-      json
     sys-uname (1.2.2)
       ffi (~> 1.1)
     test-unit (3.5.3)
@@ -123,7 +127,7 @@ DEPENDENCIES
   rake
   rspec (~> 3.3)
   rubocop
-  spinach
+  spinach!
   test-unit
 
 BUNDLED WITH