Skip to content

Sync eng/common directory with azure-sdk-tools for PR 9330 #46991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scbedd merged 3 commits into from
Nov 5, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 9330 #46991

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb8c922
disable InitializeCIArtifacts until we get a better loop for usage
scbedd Nov 5, 2024
832aaa5
feedback from Ben
scbedd Nov 5, 2024
eda8db5
ensure InitializeCIArtifacts only runs on CI machines
scbedd Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feedback from Ben
  • Loading branch information
@scbedd @azure-sdk
scbedd authored and azure-sdk committed Nov 5, 2024
commit 832aaa56f6d4adf013042a586672e1ce4a6871c0
34 changes: 18 additions & 16 deletions eng/common/scripts/Package-Properties.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,24 @@ class PackageProps {
}

[void]InitializeCIArtifacts() {
if ($env:TF_BUILD -or $env:GITHUB_ACTIONS) {
$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot ".." ".." "..")

$ciFolderPath = Join-Path -Path $RepoRoot -ChildPath (Join-Path "sdk" $this.ServiceDirectory)
$ciFiles = Get-ChildItem -Path $ciFolderPath -Filter "ci*.yml" -File

if (-not $this.ArtifactDetails) {
foreach ($ciFile in $ciFiles) {
$ciArtifactResult = $this.ParseYmlForArtifact($ciFile.FullName)
if ($ciArtifactResult) {
$this.ArtifactDetails = [Hashtable]$ciArtifactResult.ArtifactConfig
$this.CIMatrixConfigs = $ciArtifactResult.MatrixConfigs
# if this package appeared in this ci file, then we should
# treat this CI file as the source of the Matrix for this package
break
}
if ($env:SYSTEM_TEAMPROJECTID -or $env:GITHUB_ACTIONS) {
return
}

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

$ciFolderPath = Join-Path -Path $RepoRoot -ChildPath (Join-Path "sdk" $this.ServiceDirectory)
$ciFiles = Get-ChildItem -Path $ciFolderPath -Filter "ci*.yml" -File

if (-not $this.ArtifactDetails) {
foreach ($ciFile in $ciFiles) {
$ciArtifactResult = $this.ParseYmlForArtifact($ciFile.FullName)
if ($ciArtifactResult) {
$this.ArtifactDetails = [Hashtable]$ciArtifactResult.ArtifactConfig
$this.CIMatrixConfigs = $ciArtifactResult.MatrixConfigs
# if this package appeared in this ci file, then we should
# treat this CI file as the source of the Matrix for this package
break
}
}
}
Expand Down