Skip to content

Commit d1e6520

Browse files
martincostellomartincostello
authored
Merge branch 'main' into gh-5973 
2 parents 65fc0b6 + b816045 commit d1e6520

File tree

35 files changed

+197
-118
lines changed

35 files changed

+197
-118
lines changed

‎.github/renovate.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
":gitSignOff",
1616
":ignoreUnstable"
1717
],
18+
"ignorePresets": [
19+
":ignoreModulesAndTests"
20+
],
21+
"ignorePaths": [
22+
"**/node_modules/**",
23+
"**/bower_components/**",
24+
"**/vendor/**",
25+
"**/__tests__/**",
26+
"**/__fixtures__/**"
27+
],
1828
"labels": ["dependencies", "infra"],
1929
"packageRules": [
2030
{

‎.github/workflows/add-labels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
issues: write
1616
if: github.event_name == 'issues' && !github.event.issue.pull_request
1717

18-
runs-on: ubuntu-22.04
18+
runs-on: ubuntu-24.04
1919

2020
steps:
2121
- name: check out code
@@ -38,7 +38,7 @@ jobs:
3838
pull-requests: write
3939
if: github.event_name == 'pull_request_target'
4040

41-
runs-on: ubuntu-22.04
41+
runs-on: ubuntu-24.04
4242

4343
steps:
4444
- name: check out code

‎.github/workflows/automation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ permissions:
2323
jobs:
2424
resolve-automation:
2525

26-
runs-on: ubuntu-22.04
26+
runs-on: ubuntu-24.04
2727

2828
outputs:
2929
enabled: ${{ steps.evaluate.outputs.enabled }}

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
|| contains(needs.detect-changes.outputs.changes, 'otlp')
118118
|| contains(needs.detect-changes.outputs.changes, 'build')
119119
|| contains(needs.detect-changes.outputs.changes, 'shared')
120-
runs-on: ubuntu-22.04
120+
runs-on: ubuntu-24.04
121121
strategy:
122122
fail-fast: false
123123
matrix:
@@ -135,7 +135,7 @@ jobs:
135135
|| contains(needs.detect-changes.outputs.changes, 'instrumentation')
136136
|| contains(needs.detect-changes.outputs.changes, 'build')
137137
|| contains(needs.detect-changes.outputs.changes, 'shared')
138-
runs-on: ubuntu-22.04
138+
runs-on: ubuntu-24.04
139139
strategy:
140140
fail-fast: false
141141
matrix:
@@ -198,7 +198,7 @@ jobs:
198198
concurrency-tests
199199
]
200200
if: always() && !cancelled()
201-
runs-on: ubuntu-22.04
201+
runs-on: ubuntu-24.04
202202
steps:
203203
- name: Report CI status
204204
shell: bash

‎.github/workflows/codeql-analysis-steps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
show-progress: false
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
38+
uses: github/codeql-action/init@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
3939
with:
4040
build-mode: none
4141
languages: ${{ matrix.language }}
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
44+
uses: github/codeql-action/analyze@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
4545
with:
4646
category: '/language:${{ matrix.language }}'
4747

‎.github/workflows/markdownlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
run-markdownlint:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414

1515
steps:
1616
- name: check out code

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
45+
uses: github/codeql-action/upload-sarif@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
4646
with:
4747
sarif_file: results.sarif

‎.github/workflows/post-release.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ jobs:
2626
OTELBOT_DOTNET_PRIVATE_KEY: ${{ secrets.OTELBOT_DOTNET_PRIVATE_KEY }}
2727

2828
push-packages-and-publish-release:
29-
runs-on: ubuntu-22.04
29+
runs-on: ubuntu-24.04
3030

3131
needs: automation
3232

33+
permissions:
34+
id-token: write
35+
3336
if: |
3437
github.event_name == 'issue_comment' &&
3538
github.event.issue.pull_request &&
@@ -41,7 +44,7 @@ jobs:
4144
needs.automation.outputs.enabled
4245
4346
steps:
44-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
47+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
4548
id: otelbot-token
4649
with:
4750
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -56,14 +59,20 @@ jobs:
5659
- name: Setup .NET
5760
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
5861

62+
- name: NuGet log in
63+
uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544 # v1.1.0
64+
id: nuget-login
65+
with:
66+
user: ${{ secrets.NUGET_USER }}
67+
5968
- name: Push packages and publish release
6069
shell: pwsh
6170
env:
6271
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
6372
EXPECTED_PR_AUTHOR_USER_NAME: ${{ needs.automation.outputs.application-name }}
6473
COMMENT_USER_NAME: ${{ github.event.comment.user.login }}
6574
ISSUE_NUMBER: ${{ github.event.issue.number }}
66-
NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
75+
NUGET_TOKEN: ${{ steps.nuget-login.outputs.NUGET_API_KEY }}
6776
run: |
6877
Import-Module .\build\scripts\post-release.psm1
6978
@@ -77,7 +86,7 @@ jobs:
7786
-pushToNuget $HasToken
7887
7988
post-release-published:
80-
runs-on: ubuntu-22.04
89+
runs-on: ubuntu-24.04
8190

8291
needs:
8392
- automation
@@ -87,7 +96,7 @@ jobs:
8796
(github.event_name == 'release' || github.event_name == 'workflow_dispatch')
8897
8998
steps:
90-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
99+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
91100
id: otelbot-token
92101
with:
93102
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}

‎.github/workflows/prepare-release.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
OTELBOT_DOTNET_PRIVATE_KEY: ${{ secrets.OTELBOT_DOTNET_PRIVATE_KEY }}
3434

3535
prepare-release-pr:
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-24.04
3737

3838
needs: automation
3939

4040
if: github.event_name == 'workflow_dispatch' && needs.automation.outputs.enabled
4141

4242
steps:
43-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
43+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
4444
id: otelbot-token
4545
with:
4646
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -73,7 +73,7 @@ jobs:
7373
-gitUserEmail ${env:BOT_USER_EMAIL}
7474
7575
lock-pr-and-post-notice-to-create-release-tag:
76-
runs-on: ubuntu-22.04
76+
runs-on: ubuntu-24.04
7777

7878
needs: automation
7979

@@ -86,7 +86,7 @@ jobs:
8686
needs.automation.outputs.enabled
8787
8888
steps:
89-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
89+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
9090
id: otelbot-token
9191
with:
9292
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -112,7 +112,7 @@ jobs:
112112
-expectedPrAuthorUserName ${env:EXPECTED_PR_AUTHOR_USER_NAME}
113113
114114
create-release-tag-pr-post-notice:
115-
runs-on: ubuntu-22.04
115+
runs-on: ubuntu-24.04
116116

117117
needs: automation
118118

@@ -127,7 +127,7 @@ jobs:
127127
needs.automation.outputs.enabled
128128
129129
steps:
130-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
130+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
131131
id: otelbot-token
132132
with:
133133
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -160,7 +160,7 @@ jobs:
160160
-gitUserEmail ${env:BOT_USER_EMAIL}
161161
162162
update-changelog-release-dates-on-prepare-pr-post-notice:
163-
runs-on: ubuntu-22.04
163+
runs-on: ubuntu-24.04
164164

165165
needs: automation
166166

@@ -175,7 +175,7 @@ jobs:
175175
needs.automation.outputs.enabled
176176
177177
steps:
178-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
178+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
179179
id: otelbot-token
180180
with:
181181
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -209,7 +209,7 @@ jobs:
209209
-gitUserEmail ${env:BOT_USER_EMAIL}
210210
211211
update-releasenotes-on-prepare-pr-post-notice:
212-
runs-on: ubuntu-22.04
212+
runs-on: ubuntu-24.04
213213

214214
needs: automation
215215

@@ -224,7 +224,7 @@ jobs:
224224
needs.automation.outputs.enabled
225225
226226
steps:
227-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
227+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
228228
id: otelbot-token
229229
with:
230230
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}

‎.github/workflows/publish-packages-1.0.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
run: dotnet nuget push *.nupkg --api-key ${env:API_KEY} --skip-duplicate --source ${env:SOURCE}
103103

104104
post-build:
105-
runs-on: ubuntu-22.04
105+
runs-on: ubuntu-24.04
106106

107107
needs:
108108
- automation
@@ -111,7 +111,7 @@ jobs:
111111
if: needs.automation.outputs.enabled && github.event_name == 'push'
112112

113113
steps:
114-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
114+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
115115
id: otelbot-token
116116
with:
117117
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}

0 commit comments

Comments
 (0)