Skip to content

Commit 9696cf4

Browse files
sl0thentr0pysl0thentr0py
committed
Merge remote-tracking branch 'origin/master' into drop-async
2 parents b2b627f + 07aaf5e commit 9696cf4

File tree

453 files changed

+8702
-12490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+8702
-12490
lines changed

‎.craft.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
minVersion: '0.23.1'
1+
minVersion: '1.8.1'
22
changelogPolicy: simple
33
preReleaseCommand: ruby .scripts/batch_release.rb
4+
requireNames:
5+
- /^sentry-ruby-.*\.gem$/
6+
- /^sentry-ruby-core-.*\.gem$/
7+
- /^sentry-rails-.*\.gem$/
8+
- /^sentry-sidekiq-.*\.gem$/
9+
- /^sentry-resque-.*\.gem$/
10+
- /^sentry-delayed_job-.*\.gem$/
11+
- /^sentry-opentelemetry-.*\.gem$/
412
targets:
513
- name: gem
614
- name: registry
@@ -11,4 +19,5 @@ targets:
1119
'gem:sentry-sidekiq':
1220
'gem:sentry-delayed_job':
1321
'gem:sentry-opentelemetry':
22+
'gem:sentry-resque':
1423
- name: github

‎.github/workflows/lint.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Lint
2+
3+
on:
4+
pull_request:
5+
jobs:
6+
lint:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v3
10+
- name: Set up Ruby
11+
uses: ruby/setup-ruby@v1
12+
with:
13+
ruby-version: "3.3"
14+
bundler-cache: true
15+
- name: Run rubocop
16+
run: bundle exec rubocop

‎.github/workflows/sentry_delayed_job_test.yml

Lines changed: 43 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,58 @@ concurrency:
1313
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1414
cancel-in-progress: true
1515
jobs:
16+
ruby-versions:
17+
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
18+
with:
19+
engine: cruby-jruby
20+
min_version: 2.4
1621
test:
22+
needs: ruby-versions
1723
defaults:
1824
run:
1925
working-directory: sentry-delayed_job
2026
name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }}
21-
runs-on: ${{ matrix.os }}
27+
runs-on: ubuntu-latest
2228
strategy:
2329
matrix:
24-
ruby_version: [2.4, 2.5, 2.6, 2.7, '3.0', '3.1', '3.2', head, jruby]
25-
os: [ubuntu-latest]
30+
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
2631
include:
27-
- { os: ubuntu-latest, ruby_version: '3.1', options: { rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal" } }
28-
- { os: ubuntu-latest, ruby_version: '3.1', options: { codecov: 1 } }
32+
- {
33+
ruby_version: "3.2",
34+
options:
35+
{
36+
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
37+
},
38+
}
39+
- { ruby_version: "3.2", options: { codecov: 1 } }
40+
exclude:
41+
# Because Rails 7.0 currently doesn't work with Ruby head
42+
# LoadError:
43+
# cannot load such file -- mutex_m
44+
- { ruby_version: "head" }
2945
steps:
30-
- uses: actions/checkout@v1
31-
- name: Install sqlite
32-
run: |
33-
# See https://github.community/t5/GitHub-Actions/ubuntu-latest-Apt-repository-list-issues/td-p/41122/page/2
34-
for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
35-
sudo apt-get update
36-
sudo apt-get install libsqlite3-dev
46+
- uses: actions/checkout@v1
47+
- name: Install sqlite
48+
run: |
49+
# See https://github.community/t5/GitHub-Actions/ubuntu-latest-Apt-repository-list-issues/td-p/41122/page/2
50+
for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
51+
sudo apt-get update
52+
sudo apt-get install libsqlite3-dev
3753
38-
- name: Set up Ruby ${{ matrix.ruby_version }}
39-
uses: ruby/setup-ruby@v1
40-
with:
41-
ruby-version: ${{ matrix.ruby_version }}
42-
bundler: "2.3"
54+
- name: Set up Ruby ${{ matrix.ruby_version }}
55+
uses: ruby/setup-ruby@v1
56+
with:
57+
ruby-version: ${{ matrix.ruby_version }}
4358

44-
- name: Run specs
45-
env:
46-
RUBYOPT: ${{ matrix.options.rubyopt }}
47-
run: |
48-
bundle install --jobs 4 --retry 3
49-
bundle exec rake
59+
- name: Run specs
60+
env:
61+
RUBYOPT: ${{ matrix.options.rubyopt }}
62+
run: |
63+
bundle install --jobs 4 --retry 3
64+
bundle exec rake
5065
51-
- name: Upload Coverage
52-
if: ${{ matrix.options.codecov }}
53-
run: |
54-
curl -Os https://uploader.codecov.io/latest/linux/codecov
55-
chmod +x codecov
56-
./codecov -t ${CODECOV_TOKEN} -R `pwd` -f coverage/coverage.xml
66+
- name: Upload Coverage
67+
if: ${{ matrix.options.codecov }}
68+
uses: codecov/codecov-action@v4
69+
with:
70+
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/sentry_opentelemetry_test.yml

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,50 @@ concurrency:
1313
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1414
cancel-in-progress: true
1515
jobs:
16+
ruby-versions:
17+
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
18+
with:
19+
engine: cruby-jruby
20+
min_version: 2.6
1621
test:
22+
needs: ruby-versions
1723
defaults:
1824
run:
1925
working-directory: sentry-opentelemetry
2026
name: Ruby ${{ matrix.ruby_version }} & OpenTelemetry ${{ matrix.opentelemetry_version }}, options - ${{ toJson(matrix.options) }}
21-
runs-on: ${{ matrix.os }}
27+
runs-on: ubuntu-latest
2228
strategy:
2329
matrix:
24-
ruby_version: [2.6, 2.7, '3.0', '3.1', '3.2', head, jruby]
30+
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
2531
# opentelemetry_version: [1.2.0]
26-
os: [ubuntu-latest]
2732
include:
28-
- { os: ubuntu-latest, ruby_version: 3.1, options: { rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal" } }
29-
- { os: ubuntu-latest, ruby_version: 3.1, options: { codecov: 1 } }
33+
- {
34+
ruby_version: 3.2,
35+
options:
36+
{
37+
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
38+
},
39+
}
40+
- { ruby_version: 3.2, options: { codecov: 1 } }
3041
steps:
31-
- uses: actions/checkout@v1
42+
- uses: actions/checkout@v1
3243

33-
- name: Set up Ruby ${{ matrix.ruby_version }}
34-
uses: ruby/setup-ruby@8ddb7b3348b3951590db24c346e94ebafdabc926
35-
with:
36-
ruby-version: ${{ matrix.ruby_version }}
44+
- name: Set up Ruby ${{ matrix.ruby_version }}
45+
uses: ruby/setup-ruby@v1
46+
with:
47+
ruby-version: ${{ matrix.ruby_version }}
48+
bundler-cache: true
3749

38-
- name: Run specs
39-
env:
40-
RUBYOPT: ${{ matrix.options.rubyopt }}
41-
OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }}
42-
run: |
43-
bundle install --jobs 4 --retry 3
44-
bundle exec rake
50+
- name: Run specs
51+
env:
52+
RUBYOPT: ${{ matrix.options.rubyopt }}
53+
OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }}
54+
run: |
55+
bundle install --jobs 4 --retry 3
56+
bundle exec rake
4557
46-
- name: Upload Coverage
47-
if: ${{ matrix.options.codecov }}
48-
run: |
49-
curl -Os https://uploader.codecov.io/latest/linux/codecov
50-
chmod +x codecov
51-
./codecov -t ${CODECOV_TOKEN} -R `pwd` -f coverage/coverage.xml
58+
- name: Upload Coverage
59+
if: ${{ matrix.options.codecov }}
60+
uses: codecov/codecov-action@v4
61+
with:
62+
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/sentry_rails_test.yml

Lines changed: 48 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -18,73 +18,69 @@ jobs:
1818
run:
1919
working-directory: sentry-rails
2020
name: Ruby ${{ matrix.ruby_version }} & Rails ${{ matrix.rails_version }}, options - ${{ toJson(matrix.options) }}
21-
runs-on: ${{ matrix.os }}
21+
runs-on: ubuntu-latest
2222
strategy:
23+
fail-fast: false
2324
matrix:
2425
rails_version: [6.1.0, 7.0.0, 7.1.0]
25-
ruby_version: [2.7, '3.0', '3.1', '3.2', head]
26-
os: [ubuntu-latest]
26+
ruby_version: [2.7, "3.0", "3.1", "3.2", "3.3"]
2727
include:
28-
- { os: ubuntu-latest, ruby_version: "2.4", rails_version: 5.0.0 }
29-
- { os: ubuntu-latest, ruby_version: "2.4", rails_version: 5.1.0 }
30-
- { os: ubuntu-latest, ruby_version: "2.4", rails_version: 5.2.0 }
31-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 5.0.0 }
32-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 5.1.0 }
33-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 5.2.0 }
34-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 6.0.0 }
35-
- { os: ubuntu-latest, ruby_version: "2.5", rails_version: 6.1.0 }
36-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 5.0.0 }
37-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 5.1.0 }
38-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 5.2.0 }
39-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 6.0.0 }
40-
- { os: ubuntu-latest, ruby_version: "2.6", rails_version: 6.1.0 }
41-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 5.0.0 }
42-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 5.1.0 }
43-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 5.2.0 }
44-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 6.0.0 }
45-
- { os: ubuntu-latest, ruby_version: "2.7", rails_version: 6.1.0 }
46-
- { os: ubuntu-latest, ruby_version: "jruby", rails_version: 6.1.0 }
28+
- { ruby_version: "2.4", rails_version: 5.0.0 }
29+
- { ruby_version: "2.4", rails_version: 5.1.0 }
30+
- { ruby_version: "2.4", rails_version: 5.2.0 }
31+
- { ruby_version: "2.5", rails_version: 5.0.0 }
32+
- { ruby_version: "2.5", rails_version: 5.1.0 }
33+
- { ruby_version: "2.5", rails_version: 5.2.0 }
34+
- { ruby_version: "2.5", rails_version: 6.0.0 }
35+
- { ruby_version: "2.5", rails_version: 6.1.0 }
36+
- { ruby_version: "2.6", rails_version: 5.0.0 }
37+
- { ruby_version: "2.6", rails_version: 5.1.0 }
38+
- { ruby_version: "2.6", rails_version: 5.2.0 }
39+
- { ruby_version: "2.6", rails_version: 6.0.0 }
40+
- { ruby_version: "2.6", rails_version: 6.1.0 }
41+
- { ruby_version: "2.7", rails_version: 5.0.0 }
42+
- { ruby_version: "2.7", rails_version: 5.1.0 }
43+
- { ruby_version: "2.7", rails_version: 5.2.0 }
44+
- { ruby_version: "2.7", rails_version: 6.0.0 }
45+
- { ruby_version: "2.7", rails_version: 6.1.0 }
46+
- { ruby_version: "jruby", rails_version: 6.1.0 }
4747
- {
48-
os: ubuntu-latest,
49-
ruby_version: "3.1",
48+
ruby_version: "3.2",
5049
rails_version: 7.1.0,
5150
options:
5251
{
5352
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
5453
},
5554
}
5655
- {
57-
os: ubuntu-latest,
58-
ruby_version: "3.1",
56+
ruby_version: "3.2",
5957
rails_version: 7.1.0,
6058
options: { codecov: 1 },
6159
}
6260
steps:
63-
- uses: actions/checkout@v1
64-
- name: Install sqlite and ImageMagick
65-
run: |
66-
# See https://github.community/t5/GitHub-Actions/ubuntu-latest-Apt-repository-list-issues/td-p/41122/page/2
67-
for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
68-
sudo apt-get update
69-
sudo apt-get install libsqlite3-dev imagemagick
70-
- name: Set up Ruby ${{ matrix.ruby_version }}
71-
uses: ruby/setup-ruby@v1
72-
with:
73-
ruby-version: ${{ matrix.ruby_version }}
74-
bundler: "2.3"
75-
rubygems: ${{ matrix.rails_version == '7.1.0' && 'latest' || 'default' }}
61+
- uses: actions/checkout@v1
62+
- name: Install sqlite and ImageMagick
63+
run: |
64+
# See https://github.community/t5/GitHub-Actions/ubuntu-latest-Apt-repository-list-issues/td-p/41122/page/2
65+
for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
66+
sudo apt-get update
67+
sudo apt-get install libsqlite3-dev imagemagick
68+
- name: Set up Ruby ${{ matrix.ruby_version }}
69+
uses: ruby/setup-ruby@v1
70+
with:
71+
ruby-version: ${{ matrix.ruby_version }}
72+
bundler-cache: true
7673

77-
- name: Build with Rails ${{ matrix.rails_version }}
78-
env:
79-
RAILS_VERSION: ${{ matrix.rails_version }}
80-
RUBYOPT: ${{ matrix.options.rubyopt }}
81-
run: |
82-
bundle install --jobs 4 --retry 3
83-
bundle exec rake
74+
- name: Build with Rails ${{ matrix.rails_version }}
75+
env:
76+
RAILS_VERSION: ${{ matrix.rails_version }}
77+
RUBYOPT: ${{ matrix.options.rubyopt }}
78+
run: |
79+
bundle install --jobs 4 --retry 3
80+
bundle exec rake
8481
85-
- name: Upload Coverage
86-
if: ${{ matrix.options.codecov }}
87-
run: |
88-
curl -Os https://uploader.codecov.io/latest/linux/codecov
89-
chmod +x codecov
90-
./codecov -t ${CODECOV_TOKEN} -R `pwd` -f coverage/coverage.xml
82+
- name: Upload Coverage
83+
if: ${{ matrix.options.codecov }}
84+
uses: codecov/codecov-action@v4
85+
with:
86+
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)