Fix bundle cache on CI

getsentry · Oct 15, 2024 · b891231 · b891231
1 parent f3ed31e
commit b891231
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 20 deletions.
diff --git a/.github/workflows/sentry_delayed_job_test.yml b/.github/workflows/sentry_delayed_job_test.yml
@@ -25,6 +25,9 @@ jobs:
         working-directory: sentry-delayed_job
     name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-delayed_job/Gemfile
+      BUNDLE_WITHOUT: rubocop
     strategy:
       matrix:
         ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
@@ -55,13 +58,12 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
 
       - name: Run specs
         env:
           RUBYOPT: ${{ matrix.options.rubyopt }}
-        run: |
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
+        run: bundle exec rake
 
       - name: Upload Coverage
         if: ${{ matrix.options.codecov }}

diff --git a/.github/workflows/sentry_opentelemetry_test.yml b/.github/workflows/sentry_opentelemetry_test.yml
@@ -25,6 +25,9 @@ jobs:
         working-directory: sentry-opentelemetry
     name: Ruby ${{ matrix.ruby_version }} & OpenTelemetry ${{ matrix.opentelemetry_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-opentelemetry/Gemfile
+      BUNDLE_WITHOUT: rubocop
     strategy:
       matrix:
         ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
@@ -51,9 +54,7 @@ jobs:
         env:
           RUBYOPT: ${{ matrix.options.rubyopt }}
           OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }}
-        run: |
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
+        run: bundle exec rake
 
       - name: Upload Coverage
         if: ${{ matrix.options.codecov }}

diff --git a/.github/workflows/sentry_rails_test.yml b/.github/workflows/sentry_rails_test.yml
@@ -19,6 +19,9 @@ jobs:
         working-directory: sentry-rails
     name: Ruby ${{ matrix.ruby_version }} & Rails ${{ matrix.rails_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-rails/Gemfile
+      BUNDLE_WITHOUT: rubocop
     strategy:
       fail-fast: false
       matrix:
@@ -78,9 +81,7 @@ jobs:
         env:
           RAILS_VERSION: ${{ matrix.rails_version }}
           RUBYOPT: ${{ matrix.options.rubyopt }}
-        run: |
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
+        run: bundle exec rake
 
       - name: Upload Coverage
         if: ${{ matrix.options.codecov }}

diff --git a/.github/workflows/sentry_resque_test.yml b/.github/workflows/sentry_resque_test.yml
@@ -25,6 +25,9 @@ jobs:
         working-directory: sentry-resque
     name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-resque/Gemfile
+      BUNDLE_WITHOUT: rubocop
     strategy:
       matrix:
         ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
@@ -53,9 +56,7 @@ jobs:
       - name: Run specs
         env:
           RUBYOPT: ${{ matrix.options.rubyopt }}
-        run: |
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
+        run: bundle exec rake
 
       - name: Run specs with Rails
         env:

diff --git a/.github/workflows/sentry_ruby_test.yml b/.github/workflows/sentry_ruby_test.yml
@@ -26,6 +26,9 @@ jobs:
     name: Ruby ${{ matrix.ruby_version }} & Rack ${{ matrix.rack_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-ruby/Gemfile
+      BUNDLE_WITHOUT: rubocop
     strategy:
       fail-fast: false
       matrix:
@@ -73,10 +76,7 @@ jobs:
           RUBYOPT: ${{ matrix.options.rubyopt }}
           RACK_VERSION: ${{ matrix.rack_version }}
           REDIS_RB_VERSION: ${{ matrix.redis_rb_version }}
-        run: |
-          bundle config set without 'rubocop'
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
+        run: bundle exec rake
 
       - name: Upload Coverage
         if: ${{ matrix.options.codecov }}

diff --git a/.github/workflows/sentry_sidekiq_test.yml b/.github/workflows/sentry_sidekiq_test.yml
@@ -19,6 +19,9 @@ jobs:
         working-directory: sentry-sidekiq
     name: Ruby ${{ matrix.ruby_version }} & Sidekiq ${{ matrix.sidekiq_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-sidekiq/Gemfile
+      BUNDLE_WITHOUT: rubocop
     strategy:
       matrix:
         sidekiq_version: ["5.0", "6.5", "7.0"]
@@ -63,9 +66,7 @@ jobs:
         env:
           SIDEKIQ_VERSION: ${{ matrix.sidekiq_version }}
           RUBYOPT: ${{ matrix.options.rubyopt }}
-        run: |
-          bundle install --jobs 4 --retry 3
-          make test
+        run: make test
 
       - name: Upload Coverage
         if: ${{ matrix.options.codecov }}

diff --git a/sentry-sidekiq/Makefile b/sentry-sidekiq/Makefile
@@ -1,5 +1,4 @@
 build:
-	bundle install
 	gem build sentry-sidekiq.gemspec
 
 test: