Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hamshavathimunibyraiah authored Nov 7, 2024
2 parents 576d739 + 901bdbf commit c3138c7
Show file tree
Hide file tree
Showing 347 changed files with 40,147 additions and 695 deletions.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
/specification/subscriptions/ @navysingla

# PRLabel: %Synapses
/specification/synapse/ @wonner @yanjungao718
/specification/synapse/ @wanyang7 @yanjungao718

# PRLabel: %TimeseriesInsights
/specification/timeseriesinsights/ @sandshadow
Expand Down Expand Up @@ -285,5 +285,6 @@
/.azure-pipelines/ @weshaggard @mikeharder @benbp
/.github/ @weshaggard @mikeharder @benbp
/eng/ @weshaggard @mikeharder @benbp
/eng/common/ @Azure/azure-sdk-eng
/scripts/ @weshaggard @mikeharder
/.github/CODEOWNERS @Azure/azure-sdk-eng
2 changes: 1 addition & 1 deletion .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1983,7 +1983,7 @@ configuration:
then:
- mentionUsers:
mentionees:
- wonner
- wanyang7
- yanjungao718
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
assignMentionees: False
Expand Down
3 changes: 2 additions & 1 deletion cSpell.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@
"PDBs",
"undrainable",
"Undrainable",
"acnstls"
"acnstls",
"kubeletIdentity"
]
},
{
Expand Down
6 changes: 5 additions & 1 deletion eng/common/scripts/Package-Properties.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ class PackageProps {
}

[void]InitializeCIArtifacts() {
if (-not $env:SYSTEM_TEAMPROJECTID -and -not $env:GITHUB_ACTIONS) {
return
}

$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot ".." ".." "..")

$ciFolderPath = Join-Path -Path $RepoRoot -ChildPath (Join-Path "sdk" $this.ServiceDirectory)
Expand Down Expand Up @@ -168,7 +172,7 @@ function Get-PrPkgProperties([string]$InputDiffJson) {
$lookup[$lookupKey] = $pkg

foreach ($file in $targetedFiles) {
$filePath = Resolve-Path (Join-Path $RepoRoot $file)
$filePath = (Join-Path $RepoRoot $file)
$shouldInclude = $filePath -like "$pkgDirectory*"
if ($shouldInclude) {
$packagesWithChanges += $pkg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function DeployStressTests(
Write-Warning "Overriding cluster group and subscription with defaults for 'prod' environment."
}
$clusterGroup = 'rg-stress-cluster-prod'
$subscription = 'Azure SDK Test Resources'
$subscription = 'Azure SDK Test Resources - TME'
} elseif ($environment -eq 'storage') {
if ($clusterGroup -or $subscription) {
Write-Warning "Overriding cluster group and subscription with defaults for 'storage' environment."
Expand Down
84 changes: 0 additions & 84 deletions eng/scripts/Logging-Functions.ps1

This file was deleted.

2 changes: 1 addition & 1 deletion eng/scripts/Swagger-Prettier-Check.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ param (
Set-StrictMode -Version 3

. $PSScriptRoot/ChangedFiles-Functions.ps1
. $PSScriptRoot/Logging-Functions.ps1
. $PSScriptRoot/../common/scripts/logging.ps1

$repoPath = Resolve-Path "$PSScriptRoot/../.."
$pathsWithErrors = @()
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/TypeSpec-Requirement.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ param (
Set-StrictMode -Version 3

. $PSScriptRoot/ChangedFiles-Functions.ps1
. $PSScriptRoot/Logging-Functions.ps1
. $PSScriptRoot/../common/scripts/logging.ps1
. $PSScriptRoot/Suppressions-Functions.ps1

function Get-ValidatedSuppression {
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/TypeSpec-Validation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if ($TotalShards -gt 0 -and $Shard -ge $TotalShards) {
throw "Shard ($Shard) must be less than TotalShards ($TotalShards)"
}

. $PSScriptRoot/Logging-Functions.ps1
. $PSScriptRoot/../common/scripts/logging.ps1
. $PSScriptRoot/Suppressions-Functions.ps1
. $PSScriptRoot/Array-Functions.ps1

Expand Down
Loading

0 comments on commit c3138c7

Please sign in to comment.