use different gemfiles for different Ruby versions

zendesk · May 9, 2024 · f37dd7b · f37dd7b
1 parent 93bdbdc
commit f37dd7b
Show file tree

Hide file tree

Showing 13 changed files with 1,065 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,11 +29,28 @@ jobs:
         with:
           bundler-cache: true
           ruby-version: ${{ matrix.ruby }}
-      - name: Test and Lint
+
+      - name: Custom cache gems
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-${{ matrix.ruby }}
+          restore-keys: |
+            ${{ runner.os }}-gems-${{ matrix.ruby }}
+
+      - name: Install gems
         run: |
-          bundle install
-          bundle exec rake
-          bundle exec rubocop
+          BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle install --jobs 4 --retry 3 --path vendor/bundle
+
+      - name: Test
+        run: |
+          BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle exec rake
+
+      - name: Lint
+        if: matrix.ruby == '2.7'
+        run: |
+          BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop
+
   spec-live:
     name: Spec live
     if: github.repository == 'zendesk/zendesk_api_client_rb'

diff --git a/Gemfile.ruby-2-7 → Gemfile.2.7 b/Gemfile.ruby-2-7 → Gemfile.2.7
diff --git a/Gemfile.ruby-2-7.lock → Gemfile.2.7.lock b/Gemfile.ruby-2-7.lock → Gemfile.2.7.lock
diff --git a/Gemfile.3.0 b/Gemfile.3.0
@@ -0,0 +1,38 @@
+source 'https://rubygems.org'
+
+gem "jruby-openssl", platforms: :jruby
+gem "mini_mime"
+gem "rake"
+gem "addressable", ">= 2.8.0"
+gem "yard"
+gem "json", ">= 2.3.0", platforms: :ruby
+gem "scrub_rb"
+
+gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax
+
+group :test do
+  gem "webmock"
+  gem "vcr", "~> 6.0"
+
+  # Hardcoding these gems as the newer version makes the tests fail in Ruby 3
+  # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59
+  # NOTE: This affects previous build re-runs because we don't store Gemfile.lock
+  gem "rspec-support", "3.10.3"
+  gem "rspec-core", "3.10.1"
+  gem "rspec-expectations", "3.10.2"
+  gem "rspec-mocks", "3.10.2"
+  gem "rspec", "3.10.0"
+
+  # only used for uploads testing
+  gem "actionpack", ">= 5.2.4.6"
+end
+
+group :dev do
+  gem "bump"
+end
+
+group :dev, :test do
+  gem "byebug", platforms: :ruby
+end
+
+gemspec
diff --git a/Gemfile.3.0.lock b/Gemfile.3.0.lock
@@ -0,0 +1,165 @@
+PATH
+  remote: .
+  specs:
+    zendesk_api (3.0.5)
+      faraday (> 2.0.0)
+      faraday-multipart
+      hashie (>= 3.5.2, < 6.0.0)
+      inflection
+      mini_mime
+      multipart-post (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      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.2)
+      activesupport (= 7.1.3.2)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.3.2)
+      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)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    builder (3.2.4)
+    bump (0.10.0)
+    byebug (11.1.3)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    crass (1.0.6)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    erubi (1.12.0)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.1.0)
+      net-http
+    hashdiff (1.1.0)
+    hashie (5.0.0)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    inflection (1.0.0)
+    json (2.7.2)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mini_mime (1.1.5)
+    minitest (5.22.3)
+    multipart-post (2.4.1)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.4-arm64-darwin)
+      racc (~> 1.4)
+    parallel (1.24.0)
+    parser (3.3.1.0)
+      ast (~> 2.4.1)
+      racc
+    public_suffix (5.0.5)
+    racc (1.7.3)
+    rack (3.0.10)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    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)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.13.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    scrub_rb (1.0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    uri (0.13.0)
+    vcr (6.2.0)
+    webmock (3.23.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    yard (0.9.36)
+
+PLATFORMS
+  arm64-darwin-23
+
+DEPENDENCIES
+  actionpack (>= 5.2.4.6)
+  addressable (>= 2.8.0)
+  bump
+  byebug
+  jruby-openssl
+  json (>= 2.3.0)
+  mini_mime
+  rake
+  rspec (= 3.10.0)
+  rspec-core (= 3.10.1)
+  rspec-expectations (= 3.10.2)
+  rspec-mocks (= 3.10.2)
+  rspec-support (= 3.10.3)
+  rubocop (~> 1.13.0)
+  scrub_rb
+  vcr (~> 6.0)
+  webmock
+  yard
+  zendesk_api!
+
+BUNDLED WITH
+   2.2.33
diff --git a/Gemfile.3.1 b/Gemfile.3.1
@@ -0,0 +1,38 @@
+source 'https://rubygems.org'
+
+gem "jruby-openssl", platforms: :jruby
+gem "mini_mime"
+gem "rake"
+gem "addressable", ">= 2.8.0"
+gem "yard"
+gem "json", ">= 2.3.0", platforms: :ruby
+gem "scrub_rb"
+
+gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax
+
+group :test do
+  gem "webmock"
+  gem "vcr", "~> 6.0"
+
+  # Hardcoding these gems as the newer version makes the tests fail in Ruby 3
+  # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59
+  # NOTE: This affects previous build re-runs because we don't store Gemfile.lock
+  gem "rspec-support", "3.10.3"
+  gem "rspec-core", "3.10.1"
+  gem "rspec-expectations", "3.10.2"
+  gem "rspec-mocks", "3.10.2"
+  gem "rspec", "3.10.0"
+
+  # only used for uploads testing
+  gem "actionpack", ">= 5.2.4.6"
+end
+
+group :dev do
+  gem "bump"
+end
+
+group :dev, :test do
+  gem "byebug", platforms: :ruby
+end
+
+gemspec