Skip to content

Commit 7b69254

Browse files
Add installing DSC v3
1 parent 78ac043 commit 7b69254

3 files changed

Lines changed: 54 additions & 2 deletions

File tree

.ci/ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ resources:
1717
endpoint: ComplianceGHRepo
1818
name: PowerShell/compliance
1919

20+
parameters:
21+
DSCVersion: '3.2.0-preview.13'
22+
2023
variables:
2124
- group: GithubTestingFeedCreds
2225

@@ -122,29 +125,34 @@ stages:
122125
jobName: TestPkgWin
123126
displayName: PowerShell Core on Windows
124127
imageName: windows-latest
128+
DSCVersion: ${{ parameters.DSCVersion }}
125129

126130
- template: test.yml
127131
parameters:
128132
jobName: TestPkgWinPS
129133
displayName: Windows PowerShell on Windows
130134
imageName: windows-latest
131135
powershellExecutable: powershell
136+
DSCVersion: ${{ parameters.DSCVersion }}
132137

133138
- template: test.yml
134139
parameters:
135140
jobName: TestPkgUbuntu
136141
displayName: PowerShell Core on Ubuntu
137142
imageName: ubuntu-latest
143+
DSCVersion: ${{ parameters.DSCVersion }}
138144

139145
- template: test.yml
140146
parameters:
141147
jobName: TestPkgWinMacOS
142148
displayName: PowerShell Core on macOS
143149
imageName: macOS-latest
150+
DSCVersion: ${{ parameters.DSCVersion }}
144151

145152
- template: test.yml
146153
parameters:
147154
jobName: TestPkgWinAzAuth
148155
displayName: AzAuth PowerShell Core on Windows
149156
imageName: windows-latest
150157
useAzAuth: true
158+
DSCVersion: ${{ parameters.DSCVersion }}

.ci/test.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ parameters:
55
powershellExecutable: pwsh
66
buildDirectory: '.'
77
useAzAuth: false
8+
DSCVersion: '3.2.0-preview.13'
89

910
jobs:
1011
- job: ${{ parameters.jobName }}
@@ -95,6 +96,51 @@ jobs:
9596
displayName: 'Setup Azure Artifacts Credential Provider secret'
9697
condition: eq(${{ parameters.useAzAuth }}, false)
9798

99+
- pwsh: |
100+
$version = ${{ parameters.DSCVersion }}
101+
$packageName = "DSC-$version"
102+
$ext = 'tar.gz'
103+
104+
$uri = if ($IsWindows) {
105+
$ext = 'zip'
106+
"https://github.com/PowerShell/DSC/releases/download/v$version/DSC-$version-x86_64-pc-windows-msvc.zip"
107+
} else if ($IsLinux) {
108+
"https://github.com/PowerShell/DSC/releases/download/v$version/DSC-$version-x86_64-linux.tar.gz"
109+
}
110+
else if ($IsMacOS) {
111+
"https://github.com/PowerShell/DSC/releases/download/v$version/DSC-$version-aarch64-apple-darwin.tar.gz"
112+
}
113+
else {
114+
throw "Unsupported OS platform"
115+
}
116+
117+
$destPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath "$packageName.$ext"
118+
119+
Write-Verbose -Verbose "Downloading DSC v3 from $uri to $destPath"
120+
121+
Invoke-WebRequest -Uri $uri -OutFile $destPath
122+
123+
if ($IsWindows) {
124+
Expand-Archive -Path $destPath -DestinationPath $env:AGENT_TEMPDIRECTORY -Force
125+
}
126+
else {
127+
tar -xzf $destPath -C $env:AGENT_TEMPDIRECTORY
128+
}
129+
130+
$executable = Get-ChildItem -Path $destPath -File -Recurse | Where-Object { $_.Name -eq 'dsc' } | Select-Object -First 1
131+
132+
if (-not $executable) {
133+
throw "Could not find dsc executable in the downloaded package"
134+
}
135+
136+
$dscRoot = Split-Path -Path $executable.FullName -Parent
137+
138+
$vstsCommandString = "vso[task.setvariable variable=DSC_ROOT]$dscRoot"
139+
Write-Host "sending " + $vstsCommandString
140+
Write-Host "##$vstsCommandString"
141+
142+
displayName: 'Install latest DSC v3'
143+
98144
- pwsh: |
99145
Get-ChildItem -Path env: | Out-String -width 9999 -Stream | Write-Verbose -Verbose
100146
displayName: Capture environment

src/code/ContainerRegistryServerAPICalls.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,8 +1001,6 @@ internal JObject GetHttpResponseJObjectUsingDefaultHeaders(string url, HttpMetho
10011001
_cmdletPassedIn);
10021002
}
10031003

1004-
_cmdletPassedIn.WriteVerbose("Exiting ContainerRegistryServerAPICalls::GetHttpResponseJObjectUsingDefaultHeaders() with NULL");
1005-
10061004
return null;
10071005
}
10081006

0 commit comments

Comments
 (0)