Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
achauhan-scc authored Sep 30, 2024
2 parents e8ae640 + 54b2d37 commit 8d59810
Show file tree
Hide file tree
Showing 2,675 changed files with 485,531 additions and 159,274 deletions.
7 changes: 4 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
# SDK
###########

/.github/CODEOWNERS @lmazuel @xiangyan99 @kristapratico @Azure/azure-sdk-eng

# Catch all
/sdk/ @lmazuel

Expand Down Expand Up @@ -271,7 +269,7 @@
# ServiceOwners: @azureml-github @Azure/azure-ml-sdk

# PRLabel: %Machine Learning
/sdk/ml/ @paulshealy1 @achauhan-scc @kingernupur
/sdk/ml/ @paulshealy1 @achauhan-scc @kingernupur

# PRLabel: %ML-Local Endpoints
/sdk/ml/azure-ai-ml/azure/ai/ml/_local_endpoints/ @NonStatic2014 @arunsu @JustinFirsching
Expand Down Expand Up @@ -844,6 +842,9 @@
/eng/ @scbedd @weshaggard @benbp
/eng/common/ @Azure/azure-sdk-eng
/.github/workflows/ @Azure/azure-sdk-eng
/.github/CODEOWNERS @lmazuel @xiangyan99 @kristapratico @Azure/azure-sdk-eng

/.config/1espt/ @benbp @weshaggard

/tools/ @scbedd @mccoyp

Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/azure-sdk-tools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Test Azure SDK Tools

on:
workflow_dispatch:
pull_request:
branches: [ main ]
paths:
- "tools/azure-sdk-tools/**"


jobs:
build-and-test:
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# todo before checkin: multiplex to include running tests on py38 -> 312
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.11

- name: Install azure-sdk-tools
run: |
python -m pip install -e tools/azure-sdk-tools[build,ghtools]
python -m pip freeze
shell: bash

- name: Run tests
run: |
pytest ./tests
shell: bash
working-directory: tools/azure-sdk-tools
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ sdk/storage/azure-storage-blob-changefeed/tests/settings/settings_real.py
!sdk/ml/azure-ai-ml/tests/test_configs/*/*/environment*
!sdk/ml/azure-ai-ml/tests/environment*

# azure-ai-evaluation connections file
sdk/evaluation/azure-ai-evaluation/connections.json


# The locations below are deprecated - keep to prevent any accidental secrets leakage ==========
sdk/storage/azure-storage-blob/tests/_shared/settings_real.py
Expand Down
8 changes: 6 additions & 2 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,11 @@
"conda/conda-recipes/msal-extensions/meta.yaml",
"conda/conda-recipes/msrest/meta.yaml",
"conda/conda-recipes/uamqp/meta.yaml",
"conda/conda-releaselogs/azure-mgmt.md"
"conda/conda-releaselogs/azure-mgmt.md",
".github/workflows/azure-sdk-tools.yml"
],
"words": [
"msedge",
"spinup",
"cibuildwheel",
"aoai",
Expand Down Expand Up @@ -261,6 +263,7 @@
"iohttp",
"IOHTTP",
"IOLRO",
"incompat",
"inprogress",
"ipconfiguration",
"ipconfigurations",
Expand Down Expand Up @@ -467,7 +470,8 @@
"dicom",
"WINDOWSVMIMAGE",
"LINUXVMIMAGE",
"MACVMIMAGE"
"MACVMIMAGE",
"myuseragent"
],
"overrides": [
{
Expand Down
1 change: 1 addition & 0 deletions eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ known_content_issues:
- ['sdk/core/azure-common/README.rst', 'common']
- ['sdk/core/azure-core/README.md', 'common']
- ['sdk/core/azure-core/samples/README.md', 'common']
- ['sdk/core/azure-core-tracing-opentelemetry/README.md', 'common']
- ['sdk/core/corehttp/README.md', 'common']
- ['sdk/core/corehttp/samples/README.md', 'common']
- ['sdk/search/azure-search-documents/README.md', 'common']
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipelines/codeowners-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stages:
vmImage: ubuntu-22.04

variables:
CodeownersLinterVersion: '1.0.0-dev.20240917.2'
CodeownersLinterVersion: '1.0.0-dev.20240926.2'
DotNetDevOpsFeed: "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json"
RepoLabelUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/repository-labels-blob"
TeamUserUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/azure-sdk-write-teams-blob"
Expand Down
6 changes: 3 additions & 3 deletions eng/common/scripts/Update-DocsMsPackages.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function GetMetadata($moniker) {
return $metadata
}

function ValidatePackageForOnboarding2($package) {
function PackageIsValidForDocsOnboarding($package) {
if (!(Test-Path "Function:$ValidateDocsMsPackagesFn")) {
return $true
}
Expand Down Expand Up @@ -88,7 +88,7 @@ foreach ($moniker in $MONIKERS) {
if ($package.ContainsKey('_SkipDocsValidation') -and $true -eq $package['_SkipDocsValidation']) {
Write-Host "Skip validation for package: $($packageIdentity)"
}
elseif (!(ValidatePackageForOnboarding2 $package)) {
elseif (!(PackageIsValidForDocsOnboarding $package)) {
LogWarning "Skip adding package that did not pass validation: $($packageIdentity)"
continue
}
Expand All @@ -101,7 +101,7 @@ foreach ($moniker in $MONIKERS) {
$oldPackage = $alreadyOnboardedPackages[$packageIdentity]

if ($oldPackage.Version -ne $package.Version) {
if (!(ValidatePackageForOnboarding2 $package)) {
if (!(PackageIsValidForDocsOnboarding $package)) {
LogWarning "Omitting package that failed validation: $($packageIdentity)@$($package.Version)"
continue
}
Expand Down
32 changes: 31 additions & 1 deletion eng/common/scripts/Verify-ChangeLogs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,32 @@ Set-StrictMode -Version 3

. (Join-Path $PSScriptRoot common.ps1)

function ShouldVerifyChangeLog ($ServiceDirectory, $PackageName) {
$jsonCiYmlPath = Join-Path $ServiceDirectory "ci.yml"

if (Test-Path $jsonCiYmlPath)
{
$ciYml = Get-Content $jsonCiYmlPath -Raw | yq -o=json | ConvertFrom-Json -AsHashTable

if ($ciYml.extends -and $ciYml.extends.parameters -and $ciYml.extends.parameters.Artifacts) {
$packagesCheckingChangeLog = $ciYml.extends.parameters.Artifacts `
| Where-Object { -not ($_["skipVerifyChangelog"] -eq $true) } `
| Select-Object -ExpandProperty name
if ($packagesCheckingChangeLog -contains $PackageName)
{
return $true
} else {
return $false
}
}
}
}

if (-not (Get-Command 'yq' -ErrorAction SilentlyContinue)) {
Write-Host "Error: 'yq' is not installed or not found in PATH. Please remedy this before running this script."
exit 1
}

# find which packages we need to confirm the changelog for
$packageProperties = Get-ChildItem -Recurse "$PackagePropertiesFolder" *.json

Expand All @@ -15,14 +41,18 @@ $allPassing = $true
foreach($propertiesFile in $packageProperties) {
$PackageProp = Get-Content -Path $propertiesFile | ConvertFrom-Json

if (-not (ShouldVerifyChangeLog -ServiceDirectory (Join-Path $RepoRoot "sdk" $PackageProp.ServiceDirectory) -PackageName $PackageProp.Name)) {
Write-Host "Skipping changelog verification for $($PackageProp.Name)"
continue
}

$validChangeLog = Confirm-ChangeLogEntry -ChangeLogLocation $PackageProp.ChangeLogPath -VersionString $PackageProp.Version -ForRelease $false

if (-not $validChangeLog) {
$allPassing = $false
}
}


if (!$allPassing)
{
exit 1
Expand Down
Loading

0 comments on commit 8d59810

Please sign in to comment.