Skip to content

Sync eng/common directory with azure-sdk-tools for PR 9102 #46546

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 13 commits into from
Oct 11, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 9102 #46546

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
28a2e85
add compatible function which functions both on a pipeline as well as…
scbedd Oct 4, 2024
1a8898b
working through really annoying details in language-specific locations
scbedd Oct 5, 2024
63d61e0
whole bunch of debugging still present. why is this not working?
scbedd Oct 7, 2024
de3100c
just commenting a few that are operating properly
scbedd Oct 10, 2024
e812d5b
more upates
scbedd Oct 10, 2024
923795a
enable all CI settings again
scbedd Oct 10, 2024
37e9b15
remove a bunch of the debug output
scbedd Oct 10, 2024
3ee7d4c
just handle any ci.blah.yml
scbedd Oct 10, 2024
8e331bf
remove accdientally left behind reference to a core file
scbedd Oct 10, 2024
4ad426d
exit 1 -> throw
scbedd Oct 10, 2024
4de3ffa
remove some random comments that don't need to be there
scbedd Oct 10, 2024
c6f85f5
adding newline
scbedd Oct 10, 2024
753a439
get rid of a relative path from repo root when we cnan simply go rela…
scbedd Oct 10, 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
just handle any ci.blah.yml
  • Loading branch information
@scbedd @azure-sdk
scbedd authored and azure-sdk committed Oct 10, 2024
commit 3ee7d4c3311533ef281ffd9d5e65f6dc74b2e073
22 changes: 10 additions & 12 deletions eng/common/scripts/Package-Properties.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,19 @@ class PackageProps

[void]InitializeCIArtifacts(){
$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot ".." ".." "..")
$ciFilePath = Join-Path -Path $RepoRoot -ChildPath (Join-Path "sdk" $this.ServiceDirectory "ci.yml")
$ciMgmtYmlFilePath = Join-Path -Path $RepoRoot -ChildPath (Join-Path "sdk" $this.ServiceDirectory "ci.mgmt.yml")
# $ciFilePath = Join-Path -Path $RepoRoot -ChildPath (Join-Path "sdk" $this.ServiceDirectory "ci.yml")
# $ciMgmtYmlFilePath = Join-Path -Path $RepoRoot -ChildPath (Join-Path "sdk" $this.ServiceDirectory "ci.mgmt.yml")

if (-not $this.ArtifactDetails) {
$ciArtifactResult = $this.ParseYmlForArtifact($ciFilePath)
if ($ciArtifactResult) {
$this.ArtifactDetails = [Hashtable]$ciArtifactResult
}
}
$ciFolderPath = Join-Path -Path $RepoRoot -ChildPath (Join-Path "sdk" $this.ServiceDirectory)
$ciFiles = Get-ChildItem -Path $ciFolderPath -Filter "ci*.yml" -File

if (-not $this.ArtifactDetails) {
$ciMgmtResult = $this.ParseYmlForArtifact($ciMgmtYmlFilePath)

if ($ciMgmtResult) {
$this.ArtifactDetails = [Hashtable]$ciMgmtResult
foreach($ciFile in $ciFiles) {
$ciArtifactResult = $this.ParseYmlForArtifact($ciFile.FullName)
if ($ciArtifactResult) {
$this.ArtifactDetails = [Hashtable]$ciArtifactResult
break
}
}
}
}
Expand Down