From e6742be5ecc8c71c5f5acff3d32add165368d262 Mon Sep 17 00:00:00 2001 From: Peter Goldstein Date: Sun, 2 Apr 2023 22:02:00 -0400 Subject: [PATCH 1/2] Migrate CI to use multiple Rubies and add Ruby 3.2 --- .github/workflows/ci.yml | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d98eec6..805b163 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,25 +7,16 @@ on: jobs: test: runs-on: ubuntu-latest - + strategy: + fail-fast: false + matrix: + ruby: [3.2, 3.1, '3.0'] steps: - - uses: actions/checkout@v2 - - name: Restore Bundler cache - uses: actions/cache@v2 - id: cache - with: - path: vendor/bundle - key: ${{ runner.os }}-bundle-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-bundle- + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1.2 - - - name: Install dependencies - run: | - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 + ruby-version: ${{ matrix.ruby }} + bundler-cache: true - name: Run tests - run: bundle exec rake test \ No newline at end of file + run: bundle exec rake test From 8f9a625ce92445e248cfe9d43e88e4d4e2da2ffc Mon Sep 17 00:00:00 2001 From: Peter Goldstein Date: Sun, 2 Apr 2023 22:07:00 -0400 Subject: [PATCH 2/2] Remove jeweler dependency and update bundler and dependencies to enable Ruby 3.2 --- Gemfile.lock | 55 ++++++++++++++++++++++++++------------------------ wombat.gemspec | 2 -- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7438fe4..4de5c4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,16 @@ GEM remote: http://rubygems.org/ specs: - activesupport (7.0.3.1) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.2) public_suffix (>= 2.0.2, < 6.0) builder (3.2.4) - concurrent-ruby (1.1.10) - connection_pool (2.2.5) + concurrent-ruby (1.2.2) + connection_pool (2.4.0) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -25,7 +25,7 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - faraday (1.10.2) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -48,7 +48,7 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - git (1.12.0) + git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) github_api (0.19.0) @@ -59,7 +59,7 @@ GEM oauth2 (~> 1.0) hashdiff (1.0.1) hashie (3.6.0) - highline (2.0.3) + highline (2.1.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) @@ -75,8 +75,8 @@ GEM rake rdoc semver - json (2.6.2) - jwt (2.4.1) + json (2.6.3) + jwt (2.7.0) mechanize (2.8.5) addressable (~> 2.8) domain_name (~> 0.5, >= 0.5.20190701) @@ -90,31 +90,33 @@ GEM webrobots (~> 0.1.2) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - minitest (5.16.3) + mime-types-data (3.2023.0218.1) + minitest (5.18.0) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.2.3) + multipart-post (2.3.0) net-http-digest_auth (1.4.1) - net-http-persistent (4.0.1) + net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.13.8-x86_64-linux) + nokogiri (1.14.2-x86_64-darwin) racc (~> 1.4) - oauth2 (1.4.10) + nokogiri (1.14.2-x86_64-linux) + racc (~> 1.4) + oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - psych (4.0.4) + rack (>= 1.2, < 4) + psych (5.1.0) stringio - public_suffix (5.0.0) - racc (1.6.0) - rack (2.2.4) + public_suffix (5.0.1) + racc (1.6.2) + rack (3.0.7) rake (13.0.6) rchardet (1.8.0) - rdoc (6.4.0) + rdoc (6.5.0) psych (>= 4.0.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -131,7 +133,7 @@ GEM rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.4) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.0) @@ -143,15 +145,15 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - stringio (3.0.2) + stringio (3.0.5) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) thor (1.2.1) thread_safe (0.3.6) - tins (1.31.1) + tins (1.32.1) sync - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext @@ -167,6 +169,7 @@ GEM webrick (~> 1.7.0) PLATFORMS + x86_64-darwin-22 x86_64-linux DEPENDENCIES @@ -183,4 +186,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.3.20 + 2.4.10 diff --git a/wombat.gemspec b/wombat.gemspec index 582fcdd..d8b53ed 100644 --- a/wombat.gemspec +++ b/wombat.gemspec @@ -100,7 +100,6 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q.freeze, [">= 0"]) s.add_runtime_dependency(%q.freeze, [">= 0"]) s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) s.add_development_dependency(%q.freeze, [">= 0"]) s.add_development_dependency(%q.freeze, [">= 0"]) s.add_development_dependency(%q.freeze, [">= 0"]) @@ -112,7 +111,6 @@ Gem::Specification.new do |s| s.add_dependency(%q.freeze, [">= 0"]) s.add_dependency(%q.freeze, [">= 0"]) s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) s.add_dependency(%q.freeze, [">= 0"]) s.add_dependency(%q.freeze, [">= 0"]) s.add_dependency(%q.freeze, [">= 0"])