Skip to content

Commit 9696d05

Browse files
arielvalentinarielvalentin
authored
Merge branch 'main' into ruby-3.4
2 parents bd8bdcd + b98ebe8 commit 9696d05

File tree

205 files changed

+641
-362
lines changed

Some content is hidden

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

205 files changed

+641
-362
lines changed

‎.github/workflows/ci-contrib.yml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ jobs:
4949
with:
5050
gem: "opentelemetry-helpers-${{ matrix.gem }}"
5151
ruby: "3.1"
52-
- name: "Test Ruby 3.0"
53-
if: "${{ matrix.os == 'ubuntu-latest' }}"
54-
uses: ./.github/actions/test_gem
55-
with:
56-
gem: "opentelemetry-helpers-${{ matrix.gem }}"
57-
ruby: "3.0"
5852
yard: true
5953
rubocop: true
6054
build: true
@@ -99,12 +93,6 @@ jobs:
9993
with:
10094
gem: "opentelemetry-propagator-${{ matrix.gem }}"
10195
ruby: "3.1"
102-
- name: "Test Ruby 3.0"
103-
if: "${{ matrix.os == 'ubuntu-latest' }}"
104-
uses: ./.github/actions/test_gem
105-
with:
106-
gem: "opentelemetry-propagator-${{ matrix.gem }}"
107-
ruby: "3.0"
10896
yard: true
10997
rubocop: true
11098
build: true
@@ -149,15 +137,9 @@ jobs:
149137
with:
150138
gem: "opentelemetry-${{ matrix.gem }}"
151139
ruby: "3.1"
152-
- name: "Test Ruby 3.0"
153-
if: "${{ matrix.os == 'ubuntu-latest' }}"
154-
uses: ./.github/actions/test_gem
155-
with:
156-
gem: "opentelemetry-${{ matrix.gem }}"
157140
yard: true
158141
rubocop: true
159142
build: true
160-
ruby: "3.0"
161143
- name: "Test JRuby"
162144
if: "${{ matrix.os == 'ubuntu-latest' }}"
163145
uses: ./.github/actions/test_gem
@@ -197,12 +179,6 @@ jobs:
197179
with:
198180
gem: "opentelemetry-processor-${{ matrix.gem }}"
199181
ruby: "3.1"
200-
- name: "Test Ruby 3.0"
201-
if: "${{ matrix.os == 'ubuntu-latest' }}"
202-
uses: ./.github/actions/test_gem
203-
with:
204-
gem: "opentelemetry-processor-${{ matrix.gem }}"
205-
ruby: "3.0"
206182
yard: true
207183
rubocop: true
208184
build: true

‎.github/workflows/ci-instrumentation-with-services.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ jobs:
4949
with:
5050
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
5151
ruby: "3.1"
52-
- name: "Test Ruby 3.0"
53-
uses: ./.github/actions/test_gem
54-
with:
55-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
56-
ruby: "3.0"
5752
yard: true
5853
rubocop: true
5954
build: true
@@ -105,11 +100,6 @@ jobs:
105100
with:
106101
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
107102
ruby: "3.1"
108-
- name: "Test Ruby 3.0"
109-
uses: ./.github/actions/test_gem
110-
with:
111-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
112-
ruby: "3.0"
113103
yard: true
114104
rubocop: true
115105
build: true
@@ -152,11 +142,6 @@ jobs:
152142
with:
153143
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
154144
ruby: "3.1"
155-
- name: "Test Ruby 3.0"
156-
uses: ./.github/actions/test_gem
157-
with:
158-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
159-
ruby: "3.0"
160145
yard: true
161146
rubocop: true
162147
build: true
@@ -215,11 +200,6 @@ jobs:
215200
with:
216201
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
217202
ruby: "3.1"
218-
- name: "Test Ruby 3.0"
219-
uses: ./.github/actions/test_gem
220-
with:
221-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
222-
ruby: "3.0"
223203
yard: true
224204
rubocop: true
225205
build: true
@@ -269,11 +249,6 @@ jobs:
269249
with:
270250
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
271251
ruby: "3.1"
272-
- name: "Test Ruby 3.0"
273-
uses: ./.github/actions/test_gem
274-
with:
275-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
276-
ruby: "3.0"
277252
yard: true
278253
rubocop: true
279254
build: true
@@ -320,11 +295,6 @@ jobs:
320295
with:
321296
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
322297
ruby: "3.1"
323-
- name: "Test Ruby 3.0"
324-
uses: ./.github/actions/test_gem
325-
with:
326-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
327-
ruby: "3.0"
328298
yard: true
329299
rubocop: true
330300
build: true

‎.github/workflows/ci-instrumentation.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ jobs:
7979
with:
8080
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
8181
ruby: "3.1"
82-
- name: "Test Ruby 3.0"
83-
if: "${{ matrix.os == 'ubuntu-latest' }}"
84-
uses: ./.github/actions/test_gem
85-
with:
86-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
87-
ruby: "3.0"
8882
yard: true
8983
rubocop: true
9084
build: true

‎.github/workflows/release-hook-on-closed.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
release-process-request:
99
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1010
env:
11-
ruby_version: "3.0"
11+
ruby_version: "3.1"
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}

‎.github/workflows/release-hook-on-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
release-update-open-requests:
1010
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1111
env:
12-
ruby_version: "3.0"
12+
ruby_version: "3.1"
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Install Ruby ${{ env.ruby_version }}

‎.github/workflows/release-perform.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
release-perform:
1919
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
2020
env:
21-
ruby_version: "3.0"
21+
ruby_version: "3.1"
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Install Ruby ${{ env.ruby_version }}

‎.github/workflows/release-please.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
5353
- uses: ruby/[email protected]
5454
with:
55-
ruby-version: "3.0"
55+
ruby-version: "3.1"
5656
bundler: latest
5757
bundler-cache: false
5858
working-directory: ${{ matrix.path }}

‎.github/workflows/release-request-weekly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
release-request:
99
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1010
env:
11-
ruby_version: "3.0"
11+
ruby_version: "3.1"
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}

‎.github/workflows/release-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
release-request:
1313
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1414
env:
15-
ruby_version: "3.0"
15+
ruby_version: "3.1"
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Install Ruby ${{ env.ruby_version }}

‎.github/workflows/release-retry.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
release-retry:
1616
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1717
env:
18-
ruby_version: "3.0"
18+
ruby_version: "3.1"
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Install Ruby ${{ env.ruby_version }}

0 commit comments

Comments
 (0)