From 0e9282f5972ba766769ae9d1345d8b997f013b5b Mon Sep 17 00:00:00 2001 From: John O'Gara Date: Sun, 14 Jul 2024 12:40:37 +0100 Subject: [PATCH] Update to include 7.1 and latest ruby in test matrix --- .github/workflows/test.yml | 52 ++++++------ .ruby-version | 2 +- Gemfile | 2 +- Gemfile.7-1 | 17 ++++ Gemfile.7-1.lock | 167 +++++++++++++++++++++++++++++++++++++ Gemfile.lock | 2 +- 6 files changed, 214 insertions(+), 28 deletions(-) create mode 100644 Gemfile.7-1 create mode 100644 Gemfile.7-1.lock diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 584d186..db0c13c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,10 +3,10 @@ name: Tests on: push: branches: - - master + - master pull_request: branches: - - master + - master jobs: test: runs-on: ubuntu-20.04 @@ -14,29 +14,31 @@ jobs: fail-fast: false matrix: include: - - ruby: 2.5.3 - gemfile: Gemfile.5-2 - - ruby: 2.5.3 - gemfile: Gemfile.6-1 - - ruby: 2.7.3 - gemfile: Gemfile.6-1 - - ruby: 2.7.3 - gemfile: Gemfile.7-0 - - ruby: 3.2.0 - gemfile: Gemfile.6-1 - - ruby: 3.2.0 - gemfile: Gemfile.7-0 + - ruby: 2.5.3 + gemfile: Gemfile.5-2 + - ruby: 2.5.3 + gemfile: Gemfile.6-1 + - ruby: 2.7.3 + gemfile: Gemfile.6-1 + - ruby: 2.7.3 + gemfile: Gemfile.7-0 + - ruby: 3.2.0 + gemfile: Gemfile.6-1 + - ruby: 3.2.0 + gemfile: Gemfile.7-0 + - ruby: 3.3.4 + gemfile: Gemfile.7-0 env: BUNDLE_GEMFILE: "${{ matrix.gemfile }}" steps: - - uses: actions/checkout@v2 - - name: Install ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: "${{ matrix.ruby }}" - - name: Bundle - run: | - gem install bundler:1.17.3 - bundle install --no-deployment - - name: Run tests - run: bundle exec rspec + - uses: actions/checkout@v2 + - name: Install ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: "${{ matrix.ruby }}" + - name: Bundle + run: | + gem install bundler:1.17.3 + bundle install --no-deployment + - name: Run tests + run: bundle exec rspec diff --git a/.ruby-version b/.ruby-version index 944880f..a0891f5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.0 +3.3.4 diff --git a/Gemfile b/Gemfile index f9ac001..36d7f6f 120000 --- a/Gemfile +++ b/Gemfile @@ -1 +1 @@ -Gemfile.7-0 \ No newline at end of file +Gemfile.7-1 \ No newline at end of file diff --git a/Gemfile.7-1 b/Gemfile.7-1 new file mode 100644 index 0000000..5ea0197 --- /dev/null +++ b/Gemfile.7-1 @@ -0,0 +1,17 @@ +source 'https://rubygems.org' + +# Runtime dependencies +gem 'railties', '>= 7.0.1' +gem 'assignable_values' + +# Development dependencies +gem 'rspec' +gem 'rspec-rails' +gem 'rspec_candy' +gem 'shoulda-matchers' +gem 'sqlite3' +gem 'database_cleaner' +gem 'gemika', '>= 0.8.1' + +# Gem under test +gem 'consul', :path => '.' diff --git a/Gemfile.7-1.lock b/Gemfile.7-1.lock new file mode 100644 index 0000000..ce11d82 --- /dev/null +++ b/Gemfile.7-1.lock @@ -0,0 +1,167 @@ +PATH + remote: . + specs: + consul (1.3.1) + activerecord (>= 3.2) + activesupport (>= 3.2) + edge_rider (>= 0.3.0) + memoized (>= 1.0.2) + railties (>= 3.2) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activemodel (7.1.3.4) + activesupport (= 7.1.3.4) + activerecord (7.1.3.4) + activemodel (= 7.1.3.4) + activesupport (= 7.1.3.4) + timeout (>= 0.4.0) + activesupport (7.1.3.4) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + assignable_values (1.0.0) + activerecord (>= 2.3) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.3.0) + concurrent-ruby (1.3.3) + connection_pool (2.4.1) + crass (1.0.6) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.2.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + diff-lcs (1.5.1) + drb (2.2.1) + edge_rider (2.3.0) + activerecord (>= 3.2) + erubi (1.13.0) + gemika (0.8.3) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + io-console (0.7.2) + irb (1.14.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + memoized (1.1.1) + mini_portile2 (2.8.7) + minitest (5.24.1) + mutex_m (0.2.0) + nokogiri (1.16.6) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + psych (5.1.2) + stringio + racc (1.8.0) + rack (3.1.7) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.2.1) + rdoc (6.7.0) + psych (>= 4.0.0) + reline (0.5.9) + io-console (~> 0.5) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-rails (6.1.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.1) + rspec_candy (0.5.1) + rspec + sneaky-save + shoulda-matchers (6.2.0) + activesupport (>= 5.2.0) + sneaky-save (0.1.3) + activerecord (>= 3.2.0) + sqlite3 (2.0.2) + mini_portile2 (~> 2.8.0) + stringio (3.1.1) + thor (1.3.1) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + webrick (1.8.1) + zeitwerk (2.6.16) + +PLATFORMS + ruby + +DEPENDENCIES + assignable_values + consul! + database_cleaner + gemika (>= 0.8.1) + railties (>= 7.0.1) + rspec + rspec-rails + rspec_candy + shoulda-matchers + sqlite3 + +BUNDLED WITH + 2.5.15 diff --git a/Gemfile.lock b/Gemfile.lock index 23a441d..9142ed3 120000 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1 +1 @@ -Gemfile.7-0.lock \ No newline at end of file +Gemfile.7-1.lock \ No newline at end of file