Skip to content

Commit aa46f99

Browse files
authored
Merge branch 'main' into main
2 parents 167672a + 9ce76c4 commit aa46f99

File tree

4,947 files changed

+810967
-18182
lines changed

Some content is hidden

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

4,947 files changed

+810967
-18182
lines changed

.azure-pipelines/azure-pipelines-data-container.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ schedules:
77
always: true
88

99
pool:
10+
name: azsdk-pool-mms-ubuntu-2204-general
1011
vmImage: 'Ubuntu-22.04'
1112

1213
variables:

.github/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
/specification/deviceregistry/ @marcodalessandro @rohankhandelwal @riteshrao
112112

113113
# PRLabel: %Device Update
114-
/specification/deviceupdate/data-plane/ @mikekistler @Azure/api-stewardship-board
114+
/specification/deviceupdate/data-plane/ @Azure/api-stewardship-board
115115

116116
/specification/documentdb/ @dmakwana
117117

@@ -142,7 +142,7 @@
142142
/specification/keyvault/ @heaths @randallilama @jlichwa
143143

144144
# PRLabel: %Load Test Service
145-
/specification/loadtestservice/data-plane/ @mikekistler @Azure/api-stewardship-board
145+
/specification/loadtestservice/data-plane/ @Azure/api-stewardship-board
146146

147147
# PRLabel: %Logic App
148148
/specification/logic/ @pankajsn @tonytang-microsoft-com
@@ -182,7 +182,7 @@
182182
/specification/powerbidedicated/ @tarostok
183183

184184
# PRLabel: %Purview
185-
/specification/purview/data-plane @mikekistler @Azure/api-stewardship-board
185+
/specification/purview/data-plane @Azure/api-stewardship-board
186186

187187
# PRLabel: %PostgreSQL
188188
/specification/postgresql/** @Azure/azure-sdk-write-postgresql
@@ -288,4 +288,4 @@
288288
/.github/ @weshaggard @mikeharder @benbp
289289
/eng/ @weshaggard @mikeharder @benbp
290290
/scripts/ @weshaggard @mikeharder
291-
/.github/CODEOWNERS @Azure/azure-sdk-eng
291+
/.github/CODEOWNERS @Azure/azure-sdk-eng

.github/dependabot.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,9 @@ updates:
55
schedule:
66
interval: "daily"
77
allow:
8-
- dependency-name: "@azure-tools/typespec-client-generator-cli"
8+
- dependency-name: "@azure-tools/*"
9+
- dependency-name: "@typespec/*"
10+
groups:
11+
typespec:
12+
patterns:
13+
- "*"

.github/workflows/protected-files.yaml

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,44 @@ name: Protected Files
22

33
on: pull_request
44

5+
env:
6+
# Users allowed to edit protected files without failing check
7+
user-allowed: ${{ github.event.pull_request.user.login == 'azure-sdk' || github.event.pull_request.user.login == 'dependabot[bot]' }}
8+
59
jobs:
610
protected-files:
711
name: Protected Files
812

913
runs-on: ubuntu-latest
1014

1115
steps:
12-
- uses: actions/checkout@v4
13-
with:
14-
# Required since "HEAD^" is passed to Get-ChangedFiles
15-
fetch-depth: 2
16-
17-
- name: Detect changes to protected files
18-
run: |
19-
. eng/scripts/ChangedFiles-Functions.ps1
20-
21-
$protectedFiles = @("package.json", "package-lock.json")
22-
$changedFiles = @(Get-ChangedFiles -baseCommitish HEAD^ -targetCommitish HEAD -diffFilter "")
23-
$matchedFiles = @($protectedFiles | Where-Object { $changedFiles -contains $_})
24-
25-
if ($matchedFiles.Count -gt 0) {
26-
foreach ($file in $matchedFiles) {
27-
Write-Output "::error file=$file::File '$file' should only be updated by the Azure SDK team. If intentional, the PR may be merged by the Azure SDK team via bypassing the branch protections."
16+
# Since check is required, the job must pass instead of being skipped
17+
- name: User allowed
18+
if: ${{ env.user-allowed == 'true' }}
19+
run: echo "Account '${{ github.event.pull_request.user.login }}' is allowed to update protected files"
20+
21+
- uses: actions/checkout@v4
22+
if: ${{ env.user-allowed != 'true' }}
23+
with:
24+
# Required since "HEAD^" is passed to Get-ChangedFiles
25+
fetch-depth: 2
26+
27+
- name: Detect changes to protected files
28+
if: ${{ env.user-allowed != 'true' }}
29+
run: |
30+
. eng/scripts/ChangedFiles-Functions.ps1
31+
32+
$protectedFiles = @("package.json", "package-lock.json")
33+
$changedFiles = @(Get-ChangedFiles -baseCommitish HEAD^ -targetCommitish HEAD -diffFilter "")
34+
$matchedFiles = @($protectedFiles | Where-Object { $changedFiles -contains $_})
35+
36+
if ($matchedFiles.Count -gt 0) {
37+
foreach ($file in $matchedFiles) {
38+
Write-Output "::error file=$file::File '$file' should only be updated by the Azure SDK team. If intentional, the PR may be merged by the Azure SDK team via bypassing the branch protections."
39+
}
40+
exit 1
41+
}
42+
else {
43+
Write-Output "No changes to protected files: [$($protectedFiles -join ', ')]"
2844
}
29-
exit 1
30-
}
31-
else {
32-
Write-Output "No changes to protected files: [$($protectedFiles -join ', ')]"
33-
}
34-
shell: pwsh
45+
shell: pwsh

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "Azure OpenAPI"
22

33
pool:
4+
name: azsdk-pool-mms-ubuntu-2004-general
45
vmImage: 'Ubuntu-20.04'
56

67
trigger:

0 commit comments

Comments
 (0)