Skip to content

Commit

Permalink
Merge branch 'main' into cancel-builds
Browse files Browse the repository at this point in the history
  • Loading branch information
arielvalentin committed Apr 30, 2024
2 parents 653ca47 + 0675915 commit df94084
Show file tree
Hide file tree
Showing 22 changed files with 647 additions and 310 deletions.
4 changes: 2 additions & 2 deletions .github/actions/test_gem/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ runs:
# ...but not for appraisals, sadly.
- name: Install Ruby ${{ inputs.ruby }} with dependencies
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.175.1
with:
ruby-version: "${{ inputs.ruby }}"
working-directory: "${{ steps.setup.outputs.gem_dir }}"
Expand All @@ -77,7 +77,7 @@ runs:
# If we're using appraisals, do it all manually.
- name: Install Ruby ${{ inputs.ruby }} without dependencies
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.175.1
with:
ruby-version: "${{ inputs.ruby }}"
bundler: "latest"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-contrib-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-helpers-${{ matrix.gem }}"
ruby: "jruby-9.4.2.0"
ruby: "jruby-9.4.6.0"
- name: "Test truffleruby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
uses: ./.github/actions/test_gem
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-propagator-${{ matrix.gem }}"
ruby: "jruby-9.4.2.0"
ruby: "jruby-9.4.6.0"
latest: "true"
- name: "Test truffleruby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-${{ matrix.gem }}"
ruby: "jruby-9.4.2.0"
ruby: "jruby-9.4.6.0"
latest: "true"
- name: "Test truffleruby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
Expand Down
49 changes: 46 additions & 3 deletions .github/workflows/ci-contrib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-helpers-${{ matrix.gem }}"
ruby: "jruby-9.4.2.0"
ruby: "jruby-9.4.6.0"

propagators:
strategy:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-propagator-${{ matrix.gem }}"
ruby: "jruby-9.4.2.0"
ruby: "jruby-9.4.6.0"

resource-detectors:
strategy:
Expand Down Expand Up @@ -140,4 +140,47 @@ jobs:
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-${{ matrix.gem }}"
ruby: "jruby-9.4.2.0"
ruby: "jruby-9.4.6.0"

processors:
strategy:
fail-fast: false
matrix:
gem:
- baggage
os:
- ubuntu-latest
name: "processors-${{ matrix.gem }} / ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-processor-${{ matrix.gem }}"
ruby: "3.3"
- name: "Test Ruby 3.2"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-processor-${{ matrix.gem }}"
ruby: "3.2"
- name: "Test Ruby 3.1"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-processor-${{ matrix.gem }}"
ruby: "3.1"
- name: "Test Ruby 3.0"
if: "${{ matrix.os == 'ubuntu-latest' }}"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-processor-${{ matrix.gem }}"
ruby: "3.0"
yard: true
rubocop: true
build: true
- name: "Test JRuby"
if: "${{ matrix.os == 'ubuntu-latest' && steps.jruby_skip.outputs.skip == 'false' }}"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-processor-${{ matrix.gem }}"
ruby: "jruby-9.4.6.0"
139 changes: 0 additions & 139 deletions .github/workflows/ci-instrumentation-canary.yml

This file was deleted.

Loading

0 comments on commit df94084

Please sign in to comment.