Skip to content

Commit 915969f

Browse files
Merge branch 'main' into fix-test-localization
2 parents dd0d3fa + ea2cfdc commit 915969f

37 files changed

+377
-174
lines changed

.github/workflows/Component.BuildTest.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
required: false
2121
type: string
2222
os-list:
23-
default: '[ "windows-latest", "ubuntu-22.04", "ubuntu-22.04-arm" ]'
23+
default: '[ "windows-latest", "windows-11-arm", "ubuntu-22.04", "ubuntu-22.04-arm" ]'
2424
required: false
2525
type: string
2626
tfm-list:
@@ -46,6 +46,8 @@ jobs:
4646
version: net462
4747
- os: ubuntu-22.04-arm
4848
version: net8.0
49+
- os: windows-11-arm
50+
version: net8.0
4951

5052
runs-on: ${{ matrix.os }}
5153
steps:
@@ -57,13 +59,13 @@ jobs:
5759
fetch-depth: 0
5860

5961
- name: Setup previous .NET runtimes
60-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
62+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
6163
with:
6264
dotnet-version: |
6365
8.0.x
6466
6567
- name: Setup .NET
66-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
68+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
6769

6870
- name: dotnet restore ${{ inputs.project-name }}
6971
run: dotnet restore ${{ inputs.project-name }} ${{ inputs.project-build-commands }}
@@ -92,7 +94,7 @@ jobs:
9294
run: dotnet-coverage merge -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/**/*.coverage
9395

9496
- name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
95-
uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
97+
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
9698
continue-on-error: true # Note: Don't fail for upload failures
9799
env:
98100
OS: ${{ matrix.os }}

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ jobs:
4141
show-progress: false
4242

4343
- name: Initialize CodeQL
44-
uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
44+
uses: github/codeql-action/init@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
4545
with:
4646
build-mode: none
4747
languages: ${{ matrix.language }}
4848

4949
- name: Perform CodeQL Analysis
50-
uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
50+
uses: github/codeql-action/analyze@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
5151
with:
5252
category: '/language:${{ matrix.language }}'
5353

.github/workflows/concurrency-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2424

2525
- name: Setup dotnet
26-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
26+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
2727

2828
- name: Run Coyote Tests
2929
shell: pwsh

.github/workflows/docfx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818

1919
- name: Setup dotnet
20-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
20+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
2121

2222
- name: install docfx
2323
run: dotnet tool install -g docfx

.github/workflows/dotnet-format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818

1919
- name: Setup dotnet
20-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
20+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
2121

2222
- name: dotnet restore
2323
run: dotnet restore OpenTelemetry.sln
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636

3737
- name: Setup dotnet
38-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
38+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
3939

4040
- name: dotnet restore
4141
run: dotnet restore OpenTelemetry.sln

.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@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
45+
uses: github/codeql-action/upload-sarif@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
4646
with:
4747
sarif_file: results.sarif

.github/workflows/package-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fetch-depth: 0
2222

2323
- name: Setup dotnet
24-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
24+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
2525

2626
- name: dotnet pack
2727
run: dotnet pack ./build/OpenTelemetry.proj --configuration Release /p:EnablePackageValidation=true /p:ExposeExperimentalFeatures=false /p:RunningDotNetPack=true
@@ -45,7 +45,7 @@ jobs:
4545
fetch-depth: 0
4646

4747
- name: Setup dotnet
48-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
48+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
4949

5050
- name: dotnet pack
5151
run: dotnet pack ./build/OpenTelemetry.proj --configuration Release /p:EnablePackageValidation=true /p:ExposeExperimentalFeatures=true /p:RunningDotNetPack=true

.github/workflows/post-release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ jobs:
4949
token: ${{ secrets[needs.automation.outputs.token-secret-name] }}
5050
ref: ${{ github.event.repository.default_branch }}
5151

52+
- name: Setup .NET
53+
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
54+
5255
- name: Push packages and publish release
5356
shell: pwsh
5457
env:
@@ -87,7 +90,7 @@ jobs:
8790
token: ${{ secrets[needs.automation.outputs.token-secret-name] }}
8891

8992
- name: Setup dotnet
90-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
93+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
9194

9295
- name: Create GitHub Pull Request to update stable build version in props
9396
if: |

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
fetch-depth: 0
4747

4848
- name: Setup dotnet
49-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
49+
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
5050

5151
- name: Install Cosign
5252
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
@@ -87,12 +87,15 @@ jobs:
8787
if-no-files-found: error
8888

8989
- name: Publish MyGet
90+
working-directory: ./artifacts/package/release
9091
env:
9192
MYGET_TOKEN_EXISTS: ${{ secrets.MYGET_TOKEN != '' }}
93+
API_KEY: ${{ secrets.MYGET_TOKEN }}
94+
SOURCE: https://www.myget.org/F/opentelemetry/api/v2/package
9295
if: env.MYGET_TOKEN_EXISTS == 'true' # Skip MyGet publish if run on a fork without the secret
96+
shell: pwsh
9397
run: |
94-
nuget setApiKey ${{ secrets.MYGET_TOKEN }} -Source https://www.myget.org/F/opentelemetry/api/v2/package
95-
nuget push ./artifacts/package/release/*.nupkg -Source https://www.myget.org/F/opentelemetry/api/v2/package
98+
dotnet nuget push *.nupkg --api-key ${env:API_KEY} --skip-duplicate --source ${env:SOURCE}
9699
97100
post-build:
98101
runs-on: ubuntu-22.04
@@ -130,7 +133,7 @@ jobs:
130133
CreateDraftRelease `
131134
-gitRepository '${{ github.repository }}' `
132135
-tag '${{ github.ref_name }}' `
133-
-releaseFiles '${{ github.workspace }}/artifacts/${{ github.ref_name }}-packages.zip#Packages'
136+
-releaseFiles '${{ github.workspace }}/artifacts/${{ github.ref_name }}-packages.zip'
134137
135138
- name: Post notice when packages are ready
136139
shell: pwsh

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write # for actions/stale to close stale PRs
1717
runs-on: ubuntu-22.04
1818
steps:
19-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
19+
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
2020
with:
2121
stale-issue-message: 'This issue was marked stale due to lack of activity and will be closed in 7 days. Commenting will instruct the bot to automatically remove the label. This bot runs once per day.'
2222
close-issue-message: 'Closed as inactive. Feel free to reopen if this issue is still a concern.'

0 commit comments

Comments
 (0)