Skip to content

Commit 803db7a

Browse files
Merge branch 'main' into add-subscript-to-issue-templates
2 parents 3d03572 + 19bec84 commit 803db7a

File tree

98 files changed

+1879
-408
lines changed

Some content is hidden

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

98 files changed

+1879
-408
lines changed

.github/actions/test_gem/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ runs:
8484
# ...but not for appraisals, sadly.
8585
- name: Install Ruby ${{ inputs.ruby }} with dependencies
8686
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
87-
uses: ruby/setup-ruby@v1.247.0
87+
uses: ruby/setup-ruby@v1.254.0
8888
with:
8989
ruby-version: "${{ inputs.ruby }}"
9090
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -95,7 +95,7 @@ runs:
9595
# If we're using appraisals, do it all manually.
9696
- name: Install Ruby ${{ inputs.ruby }} without dependencies
9797
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
98-
uses: ruby/setup-ruby@v1.247.0
98+
uses: ruby/setup-ruby@v1.254.0
9999
with:
100100
ruby-version: "${{ inputs.ruby }}"
101101
bundler: "latest"

.github/workflows/installation-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v4
2929
# ATTENTION: Dependabot does not know how to update shared actions file.
3030
# If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
31-
- uses: ruby/setup-ruby@v1.247.0
31+
- uses: ruby/setup-ruby@v1.254.0
3232
with:
3333
ruby-version: ${{ matrix.ruby-version }}
3434
- 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
@@ -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.247.0
21+
uses: ruby/setup-ruby@v1.254.0
2222
with:
2323
ruby-version: ${{ env.ruby_version }}
2424
- 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.247.0
22+
uses: ruby/setup-ruby@v1.254.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
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Install Ruby ${{ env.ruby_version }}
31-
uses: ruby/setup-ruby@v1.247.0
31+
uses: ruby/setup-ruby@v1.254.0
3232
with:
3333
ruby-version: ${{ env.ruby_version }}
3434
- name: Checkout repo

.github/workflows/release-please.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
chmod 0600 $HOME/.gem/credentials
5858
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
5959
60-
- uses: ruby/setup-ruby@v1.247.0
60+
- uses: ruby/setup-ruby@v1.254.0
6161
with:
6262
ruby-version: "3.1"
6363
bundler: latest

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,26 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Install Ruby ${{ env.ruby_version }}
21-
uses: ruby/setup-ruby@v1.247.0
21+
uses: ruby/setup-ruby@v1.254.0
2222
with:
2323
ruby-version: ${{ env.ruby_version }}
24+
2425
- name: Checkout repo
2526
uses: actions/checkout@v4
27+
2628
- name: Install Toys
2729
run: "gem install --no-document toys -v 0.15.5"
30+
31+
- name: Create otelbot token
32+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
33+
id: otelbot-token
34+
with:
35+
app-id: ${{ vars.OTELBOT_APP_ID }}
36+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
37+
2838
- name: Open release pull request
2939
env:
30-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
3141
run: |
3242
toys release request --yes --verbose \
3343
"--release-ref=${{ github.ref }}" \

.github/workflows/release-request.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,26 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Install Ruby ${{ env.ruby_version }}
25-
uses: ruby/setup-ruby@v1.247.0
25+
uses: ruby/setup-ruby@v1.254.0
2626
with:
2727
ruby-version: ${{ env.ruby_version }}
28+
2829
- name: Checkout repo
2930
uses: actions/checkout@v4
31+
3032
- name: Install Toys
3133
run: "gem install --no-document toys -v 0.15.5"
34+
35+
- name: Create otelbot token
36+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
37+
id: otelbot-token
38+
with:
39+
app-id: ${{ vars.OTELBOT_APP_ID }}
40+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
41+
3242
- name: Open release pull request
3343
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
3545
run: |
3646
toys release request --yes --verbose \
3747
"--gems=${{ github.event.inputs.gems }}" \

.github/workflows/release-retry.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,26 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Install Ruby ${{ env.ruby_version }}
28-
uses: ruby/setup-ruby@v1.247.0
28+
uses: ruby/setup-ruby@v1.254.0
2929
with:
3030
ruby-version: ${{ env.ruby_version }}
31+
3132
- name: Checkout repo
3233
uses: actions/checkout@v4
34+
3335
- name: Install Toys
3436
run: "gem install --no-document toys -v 0.15.5"
37+
38+
- name: Create otelbot token
39+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
40+
id: otelbot-token
41+
with:
42+
app-id: ${{ vars.OTELBOT_APP_ID }}
43+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
44+
3545
- name: Retry release
3646
env:
37-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
3848
run: |
3949
toys release retry --yes --verbose \
4050
"--enable-releases=${{ secrets.ENABLE_RELEASES }}" \

.instrumentation_generator/templates/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ group :test do
2020
gem 'opentelemetry-sdk', '~> 1.0'
2121
gem 'opentelemetry-test-helpers', '~> 0.3'
2222
gem 'rake', '~> 13.0'
23-
gem 'rubocop', '~> 1.78.0'
24-
gem 'rubocop-performance', '~> 1.24.0'
23+
gem 'rubocop', '~> 1.79.1'
24+
gem 'rubocop-performance', '~> 1.25.0'
2525
gem 'simplecov', '~> 0.17.1'
2626
gem 'webmock', '~> 3.24'
2727
gem 'yard', '~> 0.9'

0 commit comments

Comments
 (0)