Skip to content

Commit 9b26e1b

Browse files
sync non-code with origin/main (#7908)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 7ad30ea commit 9b26e1b

7 files changed

+102
-19
lines changed

Diff for: .github/dependabot.template.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
#@ def getBranches():
1919
#@ return [
2020
#@ struct.encode({"name": "main", "majorVersion": "8"}),
21-
#@ struct.encode({"name": "feature/9.x", "majorVersion": "9"}),
21+
#@ struct.encode({"name": "release/9.x", "majorVersion": "9"}),
22+
#@ struct.encode({"name": "release/8.x", "majorVersion": "8"}),
2223
#@ struct.encode({"name": "release/8.0", "majorVersion": "8"}),
2324
#@ ]
2425
#@ end

Diff for: .github/dependabot.yml

+92-12
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ updates:
8989
directory: /eng/dependabot/independent
9090
schedule:
9191
interval: daily
92-
target-branch: feature/9.x
92+
target-branch: release/9.x
9393
ignore:
9494
- dependency-name: Microsoft.Extensions.*
9595
update-types:
9696
- version-update:semver-major
9797
- dependency-name: Moq
9898
commit-message:
99-
prefix: '[feature/9.x] '
99+
prefix: '[release/9.x] '
100100
groups:
101101
azure-sdk-dependencies:
102102
patterns:
@@ -111,20 +111,20 @@ updates:
111111
directory: /eng/dependabot/nuget.org
112112
schedule:
113113
interval: daily
114-
target-branch: feature/9.x
114+
target-branch: release/9.x
115115
commit-message:
116-
prefix: '[feature/9.x] '
116+
prefix: '[release/9.x] '
117117
- package-ecosystem: nuget
118118
directory: /eng/dependabot/net9.0
119119
schedule:
120120
interval: daily
121-
target-branch: feature/9.x
121+
target-branch: release/9.x
122122
ignore:
123123
- dependency-name: '*'
124124
update-types:
125125
- version-update:semver-major
126126
commit-message:
127-
prefix: '[feature/9.x] '
127+
prefix: '[release/9.x] '
128128
groups:
129129
runtime-dependencies:
130130
patterns:
@@ -135,13 +135,13 @@ updates:
135135
directory: /eng/dependabot/net8.0
136136
schedule:
137137
interval: daily
138-
target-branch: feature/9.x
138+
target-branch: release/9.x
139139
ignore:
140140
- dependency-name: '*'
141141
update-types:
142142
- version-update:semver-major
143143
commit-message:
144-
prefix: '[feature/9.x] '
144+
prefix: '[release/9.x] '
145145
groups:
146146
runtime-dependencies:
147147
patterns:
@@ -152,13 +152,13 @@ updates:
152152
directory: /eng/dependabot/net7.0
153153
schedule:
154154
interval: daily
155-
target-branch: feature/9.x
155+
target-branch: release/9.x
156156
ignore:
157157
- dependency-name: '*'
158158
update-types:
159159
- version-update:semver-major
160160
commit-message:
161-
prefix: '[feature/9.x] '
161+
prefix: '[release/9.x] '
162162
groups:
163163
runtime-dependencies:
164164
patterns:
@@ -169,13 +169,93 @@ updates:
169169
directory: /eng/dependabot/net6.0
170170
schedule:
171171
interval: daily
172-
target-branch: feature/9.x
172+
target-branch: release/9.x
173173
ignore:
174174
- dependency-name: '*'
175175
update-types:
176176
- version-update:semver-major
177177
commit-message:
178-
prefix: '[feature/9.x] '
178+
prefix: '[release/9.x] '
179+
groups:
180+
runtime-dependencies:
181+
patterns:
182+
- Microsoft.Extensions.*
183+
- Microsoft.NETCore.DotNetHost
184+
- System.Text.Json
185+
- package-ecosystem: nuget
186+
directory: /eng/dependabot/independent
187+
schedule:
188+
interval: daily
189+
target-branch: release/8.x
190+
ignore:
191+
- dependency-name: Microsoft.Extensions.*
192+
update-types:
193+
- version-update:semver-major
194+
- dependency-name: Moq
195+
commit-message:
196+
prefix: '[release/8.x] '
197+
groups:
198+
azure-sdk-dependencies:
199+
patterns:
200+
- Azure.Core
201+
- Azure.Identity
202+
- Azure.Storage.*
203+
identity-dependencies:
204+
patterns:
205+
- Microsoft.Identity.*
206+
- Microsoft.IdentityModel.*
207+
- package-ecosystem: nuget
208+
directory: /eng/dependabot/nuget.org
209+
schedule:
210+
interval: daily
211+
target-branch: release/8.x
212+
commit-message:
213+
prefix: '[release/8.x] '
214+
- package-ecosystem: nuget
215+
directory: /eng/dependabot/net8.0
216+
schedule:
217+
interval: daily
218+
target-branch: release/8.x
219+
ignore:
220+
- dependency-name: '*'
221+
update-types:
222+
- version-update:semver-major
223+
commit-message:
224+
prefix: '[release/8.x] '
225+
groups:
226+
runtime-dependencies:
227+
patterns:
228+
- Microsoft.Extensions.*
229+
- Microsoft.NETCore.DotNetHost
230+
- System.Text.Json
231+
- package-ecosystem: nuget
232+
directory: /eng/dependabot/net7.0
233+
schedule:
234+
interval: daily
235+
target-branch: release/8.x
236+
ignore:
237+
- dependency-name: '*'
238+
update-types:
239+
- version-update:semver-major
240+
commit-message:
241+
prefix: '[release/8.x] '
242+
groups:
243+
runtime-dependencies:
244+
patterns:
245+
- Microsoft.Extensions.*
246+
- Microsoft.NETCore.DotNetHost
247+
- System.Text.Json
248+
- package-ecosystem: nuget
249+
directory: /eng/dependabot/net6.0
250+
schedule:
251+
interval: daily
252+
target-branch: release/8.x
253+
ignore:
254+
- dependency-name: '*'
255+
update-types:
256+
- version-update:semver-major
257+
commit-message:
258+
prefix: '[release/8.x] '
179259
groups:
180260
runtime-dependencies:
181261
patterns:

Diff for: .github/workflows/check-markdown-links.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020

2121
- name: Check markdown links
22-
uses: gaurav-nelson/github-action-markdown-link-check@7d83e59a57f3c201c76eed3d33dff64ec4452d27
22+
uses: gaurav-nelson/github-action-markdown-link-check@1b916f2cf6c36510a6059943104e3c42ce6c16bc
2323
with:
2424
config-file: .github/linters/check-markdown-links-config.json
2525
use-quiet-mode: 'yes'

Diff for: .github/workflows/scan-for-to-do-comments.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
COMMENT_AUTHOR: ${{ github.event.comment.user.login }}
2828

2929
- name: Upload artifacts
30-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
30+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
3131
with:
3232
name: issue-todo
3333
path: issue/

Diff for: .github/workflows/submit-to-do-issue.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# The default artifact download action doesn't support cross-workflow
3636
# artifacts, so use a 3rd party one.
3737
- name: 'Download linting results'
38-
uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43
38+
uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc
3939
with:
4040
workflow: ${{env.workflow_name}}
4141
run_id: ${{github.event.workflow_run.id }}

Diff for: .github/workflows/sync-branches.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.repository == 'dotnet/dotnet-monitor'
1515
strategy:
1616
matrix:
17-
branch: ["release/8.0"]
17+
branch: ["release/8.0", "release/8.x"]
1818
name: 'Sync non-code to ${{ matrix.branch }}'
1919
runs-on: ubuntu-latest
2020
permissions:
@@ -52,7 +52,9 @@ jobs:
5252
auth_token: ${{ secrets.GITHUB_TOKEN }}
5353

5454
sync-code:
55-
if: github.repository == 'dotnet/dotnet-monitor'
55+
# Disable code sync
56+
if: false
57+
#if: github.repository == 'dotnet/dotnet-monitor'
5658
strategy:
5759
matrix:
5860
branch: ["feature/9.x"]

Diff for: .github/workflows/verify-dependabot-clearly-defined.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- name: Fetch Dependabot metadata
1616
id: metadata
17-
uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34
17+
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7
1818

1919
- name: Check ClearlyDefined
2020
if: ${{steps.metadata.outputs.package-ecosystem == 'nuget'}}

0 commit comments

Comments
 (0)