Skip to content

Commit 565e345

Browse files
Merge branch 'main' into drop-ruby-3.0
2 parents 16df9bb + 07c9cf4 commit 565e345

File tree

228 files changed

+2198
-696
lines changed

Some content is hidden

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

228 files changed

+2198
-696
lines changed

.github/actions/test_gem/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ runs:
6666
# ...but not for appraisals, sadly.
6767
- name: Install Ruby ${{ inputs.ruby }} with dependencies
6868
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
69-
uses: ruby/setup-ruby@v1.197.0
69+
uses: ruby/setup-ruby@v1.207.0
7070
with:
7171
ruby-version: "${{ inputs.ruby }}"
7272
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -77,7 +77,7 @@ runs:
7777
# If we're using appraisals, do it all manually.
7878
- name: Install Ruby ${{ inputs.ruby }} without dependencies
7979
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
80-
uses: ruby/setup-ruby@v1.197.0
80+
uses: ruby/setup-ruby@v1.207.0
8181
with:
8282
ruby-version: "${{ inputs.ruby }}"
8383
bundler: "latest"
@@ -95,6 +95,7 @@ runs:
9595
run: |
9696
# 💎 Install dependencies and generate appraisals 💎
9797
bundle install --quiet --jobs=3 --retry=4
98+
bundle exec appraisal clean
9899
bundle exec appraisal generate
99100
working-directory: "${{ steps.setup.outputs.gem_dir }}"
100101

.github/workflows/ci-contrib.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: ./.github/actions/test_gem
5353
with:
5454
gem: "opentelemetry-helpers-${{ matrix.gem }}"
55-
ruby: "jruby-9.4.8.0"
55+
ruby: "jruby-9.4.9.0"
5656

5757
propagators:
5858
strategy:
@@ -91,7 +91,7 @@ jobs:
9191
uses: ./.github/actions/test_gem
9292
with:
9393
gem: "opentelemetry-propagator-${{ matrix.gem }}"
94-
ruby: "jruby-9.4.8.0"
94+
ruby: "jruby-9.4.9.0"
9595

9696
resource-detectors:
9797
strategy:
@@ -130,7 +130,7 @@ jobs:
130130
uses: ./.github/actions/test_gem
131131
with:
132132
gem: "opentelemetry-${{ matrix.gem }}"
133-
ruby: "jruby-9.4.8.0"
133+
ruby: "jruby-9.4.9.0"
134134

135135
processors:
136136
strategy:
@@ -167,4 +167,4 @@ jobs:
167167
uses: ./.github/actions/test_gem
168168
with:
169169
gem: "opentelemetry-processor-${{ matrix.gem }}"
170-
ruby: "jruby-9.4.8.0"
170+
ruby: "jruby-9.4.9.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
uses: ./.github/actions/test_gem
5252
with:
5353
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
54-
ruby: "jruby-9.4.8.0"
54+
ruby: "jruby-9.4.9.0"
5555
services:
5656
memcached:
5757
image: memcached:alpine

.github/workflows/ci-instrumentation.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
- faraday
4040
- grape
4141
- graphql
42+
- grpc
4243
- gruf
4344
- http
4445
- http_client
@@ -96,6 +97,7 @@ jobs:
9697
[[ "${{ matrix.gem }}" == "lmdb" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9798
[[ "${{ matrix.gem }}" == "rack" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9899
[[ "${{ matrix.gem }}" == "rails" ]] && echo "skip=true" >> $GITHUB_OUTPUT
100+
[[ "${{ matrix.gem }}" == "grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
99101
[[ "${{ matrix.gem }}" == "gruf" ]] && echo "skip=true" >> $GITHUB_OUTPUT
100102
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
101103
true
@@ -104,4 +106,4 @@ jobs:
104106
uses: ./.github/actions/test_gem
105107
with:
106108
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
107-
ruby: "jruby-9.4.8.0"
109+
ruby: "jruby-9.4.9.0"

.github/workflows/ci-markdown-link.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@ name: Markdown Link Check
22

33
on:
44
pull_request:
5+
paths:
6+
- '**/*.md'
57

68
jobs:
79
markdown-link-check:
810
runs-on: ubuntu-latest
911
steps:
1012
- uses: actions/checkout@v4
1113

12-
- name: "Markdown Link Check"
13-
uses: gaurav-nelson/github-action-markdown-link-check@v1
14+
# equivalent cli: linkspector check
15+
- name: Run linkspector
16+
uses: umbrelladocs/action-linkspector@v1
1417
with:
15-
config-file: '.markdown-link-check.json'
16-
use-quiet-mode: 'yes'
17-
use-verbose-mode: 'yes'
18+
github_token: ${{ secrets.GITHUB_TOKEN }}
19+
reporter: github-pr-review
20+
fail_on_error: true

.github/workflows/ci-markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
# equivalent cli: markdownlint-cli2 "**/*.md" "#**/CHANGELOG.md" --config .markdownlint.json
1313
- name: "Markdown Lint Check"
14-
uses: DavidAnson/markdownlint-cli2-action@v17
14+
uses: DavidAnson/markdownlint-cli2-action@v19
1515
with:
1616
fix: false
1717
globs: |

.github/workflows/installation-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
ruby-version:
18+
- 3.4
1819
- 3.3
1920
- 3.2
2021
- 3.1
@@ -24,7 +25,7 @@ jobs:
2425
- uses: actions/checkout@v4
2526
# ATTENTION: Dependabot does not know how to update shared actions file.
2627
# If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
27-
- uses: ruby/setup-ruby@v1.197.0
28+
- uses: ruby/setup-ruby@v1.207.0
2829
with:
2930
ruby-version: ${{ matrix.ruby-version }}
3031
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}
15-
uses: ruby/setup-ruby@v1.197.0
15+
uses: ruby/setup-ruby@v1.207.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Install Ruby ${{ env.ruby_version }}
16-
uses: ruby/setup-ruby@v1.197.0
16+
uses: ruby/setup-ruby@v1.207.0
1717
with:
1818
ruby-version: ${{ env.ruby_version }}
1919
- name: Checkout repo

.github/workflows/release-perform.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.197.0
25+
uses: ruby/setup-ruby@v1.207.0
2626
with:
2727
ruby-version: ${{ env.ruby_version }}
2828
- name: Checkout repo

0 commit comments

Comments
 (0)