Skip to content

Commit a0319c8

Browse files
authored
fix: update setup-ruby action (#1959)
* fix: update setup-ruby action * try to pass the jaeger for jruby test * update ci * cap ruby version less than 3.2 for jaeger exporter
1 parent 1933d4c commit a0319c8

File tree

11 files changed

+26
-29
lines changed

11 files changed

+26
-29
lines changed

.github/actions/test_gem/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ runs:
5858
# ...but not for appraisals, sadly.
5959
- name: Install Ruby ${{ inputs.ruby }} with dependencies
6060
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
61-
uses: ruby/setup-ruby@v1.215.0
61+
uses: ruby/setup-ruby@v1.267.0
6262
with:
6363
ruby-version: "${{ inputs.ruby }}"
6464
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -69,7 +69,7 @@ runs:
6969
# If we're using appraisals, do it all manually.
7070
- name: Install Ruby ${{ inputs.ruby }} without dependencies
7171
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
72-
uses: ruby/setup-ruby@v1.215.0
72+
uses: ruby/setup-ruby@v1.267.0
7373
with:
7474
ruby-version: "${{ inputs.ruby }}"
7575
bundler: "latest"

.github/workflows/ci.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -129,25 +129,18 @@ jobs:
129129
yard: true
130130
rubocop: true
131131
build: true
132-
- name: "JRuby Filter"
133-
id: jruby_skip
134-
shell: bash
135-
run: |
136-
echo "skip=false" >> $GITHUB_OUTPUT
137-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp" ]] && echo "skip=true" >> $GITHUB_OUTPUT
138-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-common" ]] && echo "skip=true" >> $GITHUB_OUTPUT
139-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
140-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-http" ]] && echo "skip=true" >> $GITHUB_OUTPUT
141-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-logs" ]] && echo "skip=true" >> $GITHUB_OUTPUT
142-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-metrics" ]] && echo "skip=true" >> $GITHUB_OUTPUT
143-
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
144-
true
145-
- name: "Test JRuby"
146-
if: "${{ matrix.os == 'ubuntu-latest' && steps.jruby_skip.outputs.skip == 'false' }}"
147-
uses: ./.github/actions/test_gem
148-
with:
149-
gem: "${{ matrix.gem }}"
150-
ruby: "jruby"
132+
- name: "Test Zipkin with JRuby"
133+
if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-zipkin' }}"
134+
uses: ./.github/actions/test_gem
135+
with:
136+
gem: "${{ matrix.gem }}"
137+
ruby: "jruby"
138+
- name: "Test Jaeger with JRuby"
139+
if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-jaeger' }}"
140+
uses: ./.github/actions/test_gem
141+
with:
142+
gem: "${{ matrix.gem }}"
143+
ruby: "jruby-9.4"
151144
- name: "Truffleruby Filter"
152145
id: truffleruby_skip
153146
shell: bash

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

1818
- name: Install Ruby 3.4
19-
uses: ruby/setup-ruby@v1.255.0
19+
uses: ruby/setup-ruby@v1.267.0
2020
with:
2121
ruby-version: 3.4
2222
- name: Generate Gemfile.lock

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Install Ruby ${{ env.ruby_version }}
22-
uses: ruby/setup-ruby@v1.215.0
22+
uses: ruby/setup-ruby@v1.267.0
2323
with:
2424
ruby-version: ${{ env.ruby_version }}
2525
- name: Checkout repo

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Install Ruby ${{ env.ruby_version }}
22-
uses: ruby/setup-ruby@v1.215.0
22+
uses: ruby/setup-ruby@v1.267.0
2323
with:
2424
ruby-version: ${{ env.ruby_version }}
2525
- name: Checkout repo

.github/workflows/release-perform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Install Ruby ${{ env.ruby_version }}
30-
uses: ruby/setup-ruby@v1.215.0
30+
uses: ruby/setup-ruby@v1.267.0
3131
with:
3232
ruby-version: ${{ env.ruby_version }}
3333
- name: Checkout repo

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Install Ruby ${{ env.ruby_version }}
21-
uses: ruby/setup-ruby@v1.215.0
21+
uses: ruby/setup-ruby@v1.267.0
2222
with:
2323
ruby-version: ${{ env.ruby_version }}
2424
- name: Checkout repo

.github/workflows/release-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Install Ruby ${{ env.ruby_version }}
25-
uses: ruby/setup-ruby@v1.215.0
25+
uses: ruby/setup-ruby@v1.267.0
2626
with:
2727
ruby-version: ${{ env.ruby_version }}
2828
- name: Checkout repo

.github/workflows/release-retry.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Install Ruby ${{ env.ruby_version }}
29-
uses: ruby/setup-ruby@v1.215.0
29+
uses: ruby/setup-ruby@v1.267.0
3030
with:
3131
ruby-version: ${{ env.ruby_version }}
3232
- name: Checkout repo

exporter/jaeger/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ The `opentelemetry-exporter-jaeger` gem source is [on github][repo-github], alon
100100

101101
The OpenTelemetry Ruby gems are maintained by the OpenTelemetry-Ruby special interest group (SIG). You can get involved by joining us in [GitHub Discussions][discussions-url] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].
102102

103+
## Compatibility with JRuby
104+
105+
The `opentelemetry-exporter-jaeger` gem can only work with JRuby version less than 10.0.0.0 (e.g. <= jruby-9.4.14.0)
106+
103107
## License
104108

105109
The `opentelemetry-exporter-jaeger` gem is distributed under the Apache 2.0 license. See [LICENSE][license-github] for more information.

0 commit comments

Comments
 (0)