Skip to content

Commit 6bb81eb

Browse files
Merge branch 'nacho/dotnet10Test' of https://github.com/DataDog/dd-trace-dotnet into nacho/dotnet10Test
2 parents 6642b05 + af4da95 commit 6bb81eb

File tree

75 files changed

+10357
-343
lines changed

Some content is hidden

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

75 files changed

+10357
-343
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject_pattern: repo:DataDog/dd-trace-dotnet:.*
4+
5+
claim_pattern:
6+
event_name: (schedule|workflow_dispatch|pull_request_target)
7+
ref: refs/heads/master
8+
ref_protected: "true"
9+
job_workflow_ref: DataDog/dd-trace-dotnet/\.github/workflows/auto_bump_test_package_versions\.yml@refs/heads/master
10+
11+
permissions:
12+
contents: write
13+
pull_requests: write
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject_pattern: repo:DataDog/dd-trace-dotnet:ref:refs/tags/.*
4+
5+
claim_pattern:
6+
event_name: release
7+
ref: refs/tags/.*
8+
job_workflow_ref: DataDog/dd-trace-dotnet/.github/workflows/auto_create_version_bump_pr.yml@refs/tags/.*
9+
10+
permissions:
11+
contents: write
12+
pull_requests: write
13+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject: repo:DataDog/dd-trace-dotnet:ref:refs/heads/master
4+
5+
claim_pattern:
6+
event_name: workflow_dispatch
7+
ref: refs/heads/master
8+
ref_protected: "true"
9+
job_workflow_ref: DataDog/dd-trace-dotnet/.github/workflows/force_manual_version_bump.yml@refs/heads/master
10+
11+
permissions:
12+
contents: write
13+
pull_requests: write

.github/workflows/auto_bump_test_package_versions.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Auto bump test package versions
22

33
on:
44
schedule:
5-
- cron: '0 0 * * 0' # Every Sunday at midnight
5+
- cron: "0 0 * * 0" # Every Sunday at midnight
66
pull_request_target:
7-
branches: [master, main]
7+
branches: [master]
88
workflow_dispatch:
99

1010
jobs:
@@ -13,23 +13,29 @@ jobs:
1313
runs-on: windows-latest
1414
permissions:
1515
actions: read # read secrets
16-
contents: write # Creates a branch
17-
pull-requests: write # Creates a PR
16+
id-token: write # Required for dd-octo-sts authentication
1817
env:
1918
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2019

2120
steps:
2221
- name: Support longpaths
2322
run: git config --system core.longpaths true
2423

24+
- name: Get dd-octo-sts token
25+
uses: DataDog/dd-octo-sts-action@08f2144903ced3254a3dafec2592563409ba2aa0 # v1.0.1
26+
id: octo-sts
27+
with:
28+
scope: DataDog/dd-trace-dotnet
29+
policy: self.auto_bump_test_package_versions.create-pr
30+
2531
- name: Checkout
2632
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2733
with:
2834
ref: ${{ github.event.pull_request.base.sha }}
2935

3036
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
3137
with:
32-
dotnet-version: '10.0.100-preview.6.25358.103'
38+
dotnet-version: "10.0.100-preview.6.25358.103"
3339

3440
- name: "Regenerating package versions"
3541
run: .\tracer\build.ps1 GeneratePackageVersions
@@ -38,7 +44,7 @@ jobs:
3844
id: pr
3945
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
4046
with:
41-
token: ${{ secrets.GITHUB_TOKEN }}
47+
token: ${{ steps.octo-sts.outputs.token }}
4248
branch: "bot/test-package-versions-bump"
4349
commit-message: "[Test Package Versions Bump]"
4450
delete-branch: true
@@ -47,7 +53,7 @@ jobs:
4753
milestone: "${{steps.rename.outputs.milestone}}"
4854
body: |
4955
Updates the package versions for integration tests.
50-
56+
5157
- name: Send Slack notification about generating failure
5258
if: failure()
5359
uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0

.github/workflows/auto_create_version_bump_pr.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,27 @@ jobs:
1010
# If this is a 1.x release, do the version bump in the release/1.x branch
1111
# If this is a 2.x release, do the version bump in the release/2.x branch
1212
# If this is a 3.x.0 release, do the version bump on master
13-
13+
1414
if: endsWith(github.event.release.tag_name, '.0') || endsWith(github.event.release.tag_name, '.0-prerelease')
1515
runs-on: windows-latest
1616
permissions:
1717
contents: write # Creates a branch
18-
pull-requests: write # Creates a PR
1918
issues: write # Closes milestones
19+
id-token: write # Required for dd-octo-sts authentication
2020
env:
2121
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2222

2323
steps:
2424
- name: Support longpaths
2525
run: git config --system core.longpaths true
2626

27+
- name: Get dd-octo-sts token
28+
uses: DataDog/dd-octo-sts-action@08f2144903ced3254a3dafec2592563409ba2aa0 # v1.0.1
29+
id: octo-sts
30+
with:
31+
scope: DataDog/dd-trace-dotnet
32+
policy: self.auto_create_version_bump_pr.create-pr
33+
2734
- name: "Select branch"
2835
id: select_branch
2936
run: |
@@ -47,7 +54,7 @@ jobs:
4754
4855
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
4956
with:
50-
dotnet-version: '10.0.100-preview.6.25358.103'
57+
dotnet-version: "10.0.100-preview.6.25358.103"
5158

5259
- name: "Update Changelog"
5360
run: .\tracer\build.ps1 UpdateChangeLog
@@ -72,7 +79,7 @@ jobs:
7279
id: pr
7380
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
7481
with:
75-
token: ${{ secrets.GITHUB_TOKEN }}
82+
token: ${{ steps.octo-sts.outputs.token }}
7683
branch: "version-bump-${{steps.versions.outputs.full_version}}"
7784
commit-message: "[Version Bump] ${{steps.versions.outputs.full_version}}"
7885
delete-branch: true

.github/workflows/force_manual_version_bump.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@ on:
77
description: 'Next Version Number (x.y.z). On master, other workflows expect only versions of the form x.y.0. Consider using the "create hotfix branch" workflow for patch version bumps.'
88
required: true
99
is_prerelease:
10-
description: 'Is Prerelease version? (true/false)'
11-
default: 'false'
10+
description: "Is Prerelease version? (true/false)"
11+
default: "false"
1212
required: true
1313

1414
jobs:
1515
bump_version:
1616
runs-on: windows-latest
1717
permissions:
18-
contents: write # Creates a branch
19-
pull-requests: write # Creates a PR
2018
issues: write # Closes milestones
19+
id-token: write # Required for dd-octo-sts authentication
2120
env:
2221
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2322
NewVersion: "${{ github.event.inputs.version }}"
@@ -27,12 +26,19 @@ jobs:
2726
- name: Support longpaths
2827
run: git config --system core.longpaths true
2928

29+
- name: Get dd-octo-sts token
30+
uses: DataDog/dd-octo-sts-action@08f2144903ced3254a3dafec2592563409ba2aa0 # v1.0.1
31+
id: octo-sts
32+
with:
33+
scope: DataDog/dd-trace-dotnet
34+
policy: self.force_manual_version_bump.create-pr
35+
3036
- name: Checkout
3137
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3238

3339
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
3440
with:
35-
dotnet-version: '10.0.100-preview.6.25358.103'
41+
dotnet-version: "10.0.100-preview.6.25358.103"
3642

3743
- name: "Bump Version"
3844
run: .\tracer\build.ps1 UpdateVersion
@@ -49,7 +55,7 @@ jobs:
4955
id: pr
5056
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
5157
with:
52-
token: ${{ secrets.GITHUB_TOKEN }}
58+
token: ${{ steps.octo-sts.outputs.token }}
5359
branch: "version-bump-${{steps.versions.outputs.full_version}}"
5460
commit-message: "[Version Bump] ${{steps.versions.outputs.full_version}}"
5561
delete-branch: true

0 commit comments

Comments
 (0)