From d425b11cdfa92fda5846e3e61838c5dbc4d0cb48 Mon Sep 17 00:00:00 2001 From: Igor Pstyga Date: Tue, 31 Jan 2023 12:12:42 -0800 Subject: [PATCH] updates-2023-01-31 (#106) * 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 https://github.com/jruby/jruby/issues/7543 * Bump actions/checkout --- .github/workflows/ci.yml | 12 +++++------- .ruby-version | 2 +- Gemfile.lock | 18 +++++++++--------- spec/spec_helper.rb | 20 +++++++++++--------- vendor/uap-core | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e831fb1..cad6da8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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') }} @@ -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 diff --git a/.ruby-version b/.ruby-version index ef538c2..ff365e0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.1.3 diff --git a/Gemfile.lock b/Gemfile.lock index 0d9e186..3493cb9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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 @@ -38,4 +38,4 @@ DEPENDENCIES user_agent_parser! BUNDLED WITH - 2.3.24 + 2.4.6 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 19447eb..7aeb4e1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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' diff --git a/vendor/uap-core b/vendor/uap-core index dc85ab2..1ef0926 160000 --- a/vendor/uap-core +++ b/vendor/uap-core @@ -1 +1 @@ -Subproject commit dc85ab2628798538a2874dea4a9563f40a31f55a +Subproject commit 1ef0926f2b489cc929589c00f8b8a3efce25acc3