Skip to content

Commit 1443c69

Browse files
ci: Fix indentation on ci.yml; update jaeger exporter tested ruby environments (#1965)
* ci: Fix indentation on ci.yml * ci: exclude jaeger exporter from all runs except ruby 3.1, jruby
1 parent a934bbe commit 1443c69

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,29 @@ jobs:
9999
# Doesn't build on macos
100100
- os: macos-latest
101101
gem: opentelemetry-exporter-jaeger
102+
# Windows runs Ruby 3.4, which isn't compatible with this gem
103+
- os: windows-latest
104+
gem: opentelemetry-exporter-jaeger
102105
- os: windows-latest
103106
gem: opentelemetry-exporter-otlp-grpc
104107
name: ${{ matrix.gem }} / ${{ matrix.os }}
105108
runs-on: ${{ matrix.os }}
106109
steps:
107110
- uses: actions/checkout@v2
108111
- name: "Test Ruby 3.4"
112+
if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}"
109113
uses: ./.github/actions/test_gem
110114
with:
111115
gem: "${{ matrix.gem }}"
112116
ruby: "3.4"
113117
- name: "Test Ruby 3.3"
118+
if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}"
114119
uses: ./.github/actions/test_gem
115120
with:
116121
gem: "${{ matrix.gem }}"
117122
ruby: "3.3"
118123
- name: "Test Ruby 3.2"
124+
if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}"
119125
uses: ./.github/actions/test_gem
120126
with:
121127
gem: "${{ matrix.gem }}"
@@ -130,23 +136,24 @@ jobs:
130136
rubocop: true
131137
build: true
132138
- 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"
139+
if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-zipkin' }}"
140+
uses: ./.github/actions/test_gem
141+
with:
142+
gem: "${{ matrix.gem }}"
143+
ruby: "jruby"
138144
- 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"
145+
if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-jaeger' }}"
146+
uses: ./.github/actions/test_gem
147+
with:
148+
gem: "${{ matrix.gem }}"
149+
ruby: "jruby-9.4"
144150
- name: "Truffleruby Filter"
145151
id: truffleruby_skip
146152
shell: bash
147153
run: |
148154
echo "skip=false" >> $GITHUB_OUTPUT
149-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
155+
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
156+
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-jaeger" ]] && echo "skip=true" >> $GITHUB_OUTPUT
150157
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
151158
true
152159
- name: "Test truffleruby"

exporter/jaeger/.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ Metrics/BlockLength:
1919
Naming/FileName:
2020
Exclude:
2121
- "lib/opentelemetry-exporter-jaeger.rb"
22+
Gemspec/RequiredRubyVersion:
23+
Severity: info

0 commit comments

Comments
 (0)