Skip to content

Commit

Permalink
updates-2023-01-31 (#106)
Browse files Browse the repository at this point in the history
* bump-gems-2023-01-31

* Sync with uap-core

* Simplify tests matrix

* Limit simplecov to a single test run

* Lock jruby version for tests

Ref jruby/jruby#7543

* Bump actions/checkout
  • Loading branch information
opti authored Jan 31, 2023
1 parent 312c331 commit d425b11
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ jobs:
- '3.1'
- '3.0'
- '2.7'
- '2.6'
- '2.5'
- 'jruby'
- 'jruby-9.3.8.0'
include:
- ruby: '3.1'
coverage: 'true'
coverage: '1'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: Setup Ruby
Expand All @@ -33,7 +31,7 @@ jobs:
- name: Update rubygems
run: |
gem update --system
- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: vendor/bundle
key: bundle-use-ruby-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -45,7 +43,7 @@ jobs:
bundle install --jobs 4 --retry 3
- name: Run specs
env:
GITHUB_COVERAGE: ${{ matrix.coverage }}
SIMPLECOV: ${{ matrix.coverage }}
run: |
bundle exec rake test
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.1.3
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ PATH
GEM
remote: https://rubygems.org/
specs:
coveralls_reborn (0.25.0)
simplecov (>= 0.18.1, < 0.22.0)
term-ansicolor (~> 1.6)
thor (>= 0.20.3, < 2.0)
tins (~> 1.16)
coveralls_reborn (0.26.0)
simplecov (~> 0.22.0)
term-ansicolor (~> 1.7)
thor (~> 1.2)
tins (~> 1.32)
docile (1.4.0)
minitest (5.16.3)
minitest (5.17.0)
rake (13.0.6)
simplecov (0.21.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
Expand All @@ -24,7 +24,7 @@ GEM
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.2.1)
tins (1.31.1)
tins (1.32.1)
sync

PLATFORMS
Expand All @@ -38,4 +38,4 @@ DEPENDENCIES
user_agent_parser!

BUNDLED WITH
2.3.24
2.4.6
20 changes: 11 additions & 9 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
# frozen_string_literal: true

require 'coveralls'
require 'simplecov'
if ENV['SIMPLECOV'] == '1'
require 'coveralls'
require 'simplecov'

SimpleCov.formatter = Coveralls::SimpleCov::Formatter
SimpleCov.start do
add_filter '/.bundle/'
add_filter '/doc/'
add_filter '/spec/'
add_filter '/config/'
merge_timeout 600
SimpleCov.formatter = Coveralls::SimpleCov::Formatter
SimpleCov.start do
add_filter '/.bundle/'
add_filter '/doc/'
add_filter '/spec/'
add_filter '/config/'
merge_timeout 600
end
end

require 'minitest/autorun'
Expand Down
2 changes: 1 addition & 1 deletion vendor/uap-core

0 comments on commit d425b11

Please sign in to comment.