Skip to content

Commit bd5fde8

Browse files
authored
Update channels for 7.4 GA (#780)
* Update channels.json * Use UriBuilder to build Uri so that we always have a ? * Change LTS back to 7.2
1 parent 88ad0fe commit bd5fde8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.vsts-ci/releasePhase.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ jobs:
104104
displayName: 'docker login $(dockerHost)'
105105
condition: and( succeededOrFailed(), ne(variables['Channel'],''))
106106
107-
108107
- pwsh: |
109108
if($env:ACR -eq 'yes')
110109
{
@@ -138,7 +137,9 @@ jobs:
138137
$containerName = $containerName.Replace('.', '-')
139138
$context = New-AzStorageContext -StorageAccountName $(StorageAccount)
140139
$querystring = New-AzStorageContainerSASToken -Context $context -Name $containerName -Permission r -ExpiryTime ((get-date).AddMinutes(180)) -Protocol HttpsOnly
141-
$url = "https://$(StorageAccount).blob.core.windows.net/$querystring"
140+
$uriBuilder = [System.UriBuilder]::new("https://$(StorageAccount).blob.core.windows.net")
141+
$uriBuilder.Query = $querystring.ToString()
142+
$url = $uriBuilder.ToString()
142143
Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
143144
displayName: 'Set SasUrl variable'
144145
condition: and( succeededOrFailed(), ne(variables['Channel'],''))
@@ -185,7 +186,7 @@ jobs:
185186
displayName: 'docker logout'
186187
condition: and( always(), ne(variables['Channel'],''))
187188

188-
- pwsh: |
189+
- pwsh: |
189190
if($env:ACR -eq 'yes')
190191
{
191192
Write-Host 'Using ACR, will need to az logout'

tools/buildHelper/channels.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "stable",
4-
"path": "release/7-3",
4+
"path": "release/7-4",
55
"pwshInstallVersion": "7",
66
"packageTag": ""
77
},

0 commit comments

Comments
 (0)