Skip to content

Commit

Permalink
Merge branch 'main' into add-weekly-release-build
Browse files Browse the repository at this point in the history
  • Loading branch information
arielvalentin authored Apr 30, 2024
2 parents 7cb61d9 + 3aac643 commit 45d5fbc
Show file tree
Hide file tree
Showing 22 changed files with 663 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
10 changes: 7 additions & 3 deletions .github/workflows/ci-contrib-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
schedule:
- cron: "0 0 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} # Ensure that only one instance of this workflow is running per Pull Request
cancel-in-progress: true # Cancel any previous runs of this workflow

jobs:
helpers:
strategy:
Expand Down Expand Up @@ -45,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 @@ -101,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 @@ -160,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
53 changes: 50 additions & 3 deletions .github/workflows/ci-contrib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} # Ensure that only one instance of this workflow is running per Pull Request
cancel-in-progress: true # Cancel any previous runs of this workflow

jobs:
helpers:
strategy:
Expand Down Expand Up @@ -47,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 @@ -91,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 @@ -136,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 45d5fbc

Please sign in to comment.