Skip to content

Fix bundle cache on CI #2432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Fix bundle cache on CI #2432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73c7046
Fix bundle cache on CI
solnic Oct 15, 2024
0939825
[sidekiq] remove test run step from Makefile + restore bundle install
solnic Oct 15, 2024
e7c3ec4
[resque] simplify running specs with/without Rails on CI
solnic Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/sentry_delayed_job_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ jobs:
working-directory: sentry-delayed_job
name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
runs-on: ubuntu-latest
env:
RUBYOPT: ${{ matrix.options.rubyopt }}
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-delayed_job/Gemfile
BUNDLE_WITHOUT: rubocop
strategy:
fail-fast: false
matrix:
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
include:
Expand Down Expand Up @@ -55,13 +60,10 @@ 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 }}
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/sentry_opentelemetry_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ jobs:
working-directory: sentry-opentelemetry
name: Ruby ${{ matrix.ruby_version }} & OpenTelemetry ${{ matrix.opentelemetry_version }}, options - ${{ toJson(matrix.options) }}
runs-on: ubuntu-latest
env:
RUBYOPT: ${{ matrix.options.rubyopt }}
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-opentelemetry/Gemfile
BUNDLE_WITHOUT: rubocop
OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }}
strategy:
fail-fast: false
matrix:
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
# opentelemetry_version: [1.2.0]
Expand All @@ -48,12 +54,7 @@ jobs:
bundler-cache: true

- name: Run specs
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 }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sentry_rails_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
working-directory: sentry-rails
name: Ruby ${{ matrix.ruby_version }} & Rails ${{ matrix.rails_version }}, options - ${{ toJson(matrix.options) }}
runs-on: ubuntu-latest
env:
RUBYOPT: ${{ matrix.options.rubyopt }}
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-rails/Gemfile
BUNDLE_WITHOUT: rubocop
RAILS_VERSION: ${{ matrix.rails_version }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -75,12 +80,7 @@ jobs:
bundler-cache: true

- name: Build with Rails ${{ matrix.rails_version }}
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 }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/sentry_resque_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ jobs:
working-directory: sentry-resque
name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
runs-on: ubuntu-latest
env:
RUBYOPT: ${{ matrix.options.rubyopt }}
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-resque/Gemfile
BUNDLE_WITHOUT: rubocop
strategy:
fail-fast: false
matrix:
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
include:
Expand All @@ -50,20 +55,15 @@ jobs:
with:
redis-version: 5

- name: Run specs
- name: Run specs without Rails
env:
RUBYOPT: ${{ matrix.options.rubyopt }}
run: |
bundle install --jobs 4 --retry 3
bundle exec rake
run: BUNDLE_WITHOUT="rubocop rails" bundle exec rake

- name: Run specs with Rails
env:
BUNDLE_GEMFILE: Gemfile_with_rails.rb
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 }}
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/sentry_ruby_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ jobs:
name: Ruby ${{ matrix.ruby_version }} & Rack ${{ matrix.rack_version }}, options - ${{ toJson(matrix.options) }}
runs-on: ubuntu-latest
timeout-minutes: 10
env:
RUBYOPT: ${{ matrix.options.rubyopt }}
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-ruby/Gemfile
BUNDLE_WITHOUT: rubocop
RACK_VERSION: ${{ matrix.rack_version }}
REDIS_RB_VERSION: ${{ matrix.redis_rb_version }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -69,14 +75,7 @@ jobs:
redis-version: 6

- name: Run specs with Rack ${{ matrix.rack_version }} and redis-rb ${{ matrix.redis_rb_version }}
env:
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 }}
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sentry_sidekiq_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ jobs:
working-directory: sentry-sidekiq
name: Ruby ${{ matrix.ruby_version }} & Sidekiq ${{ matrix.sidekiq_version }}, options - ${{ toJson(matrix.options) }}
runs-on: ubuntu-latest
env:
RUBYOPT: ${{ matrix.options.rubyopt }}
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-sidekiq/Gemfile
BUNDLE_WITHOUT: rubocop
SIDEKIQ_VERSION: ${{ matrix.sidekiq_version }}
strategy:
fail-fast: false
matrix:
sidekiq_version: ["5.0", "6.5", "7.0"]
ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3", jruby]
Expand Down Expand Up @@ -61,11 +67,8 @@ jobs:

- name: Run specs with Sidekiq ${{ matrix.sidekiq_version }}
env:
SIDEKIQ_VERSION: ${{ matrix.sidekiq_version }}
RUBYOPT: ${{ matrix.options.rubyopt }}
run: |
bundle install --jobs 4 --retry 3
make test
WITH_SENTRY_RAILS: 1
run: bundle exec rake

- name: Upload Coverage
if: ${{ matrix.options.codecov }}
Expand Down
5 changes: 5 additions & 0 deletions sentry-resque/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ gem "sentry-ruby", path: "../sentry-ruby"
gem "resque-retry", "~> 1.8"

eval_gemfile File.expand_path("../Gemfile", __dir__)

group :rails do
gem "sentry-rails", path: "../sentry-rails"
gem "rails"
end
6 changes: 0 additions & 6 deletions sentry-resque/Gemfile_with_rails.rb
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions sentry-sidekiq/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
build:
bundle install
gem build sentry-sidekiq.gemspec

test:
WITH_SENTRY_RAILS=1 bundle exec rspec spec/sentry/rails_spec.rb
bundle exec rspec
Loading