Skip to content

Commit b65c5dc

Browse files
committed
updated CI 7
1 parent 887c0e5 commit b65c5dc

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

.azdevops/TestsTemplate.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
3232
if ("${{ parameters.vmImageName }}" -like 'macos-*')
3333
{
34-
$url = "https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-x64.pkg"
34+
$url = "https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-x64.tar.gz"
3535
$downloadFilename = "pwsh_download.pkg"
3636
}
3737
if ("${{ parameters.vmImageName }}" -like 'ubuntu-*')
@@ -48,16 +48,8 @@ jobs:
4848
Expand-Archive -Path $downloadDestination -DestinationPath "pwsh-preview"
4949
$powerShellPreview = Join-Path $pwd "pwsh-preview" "pwsh.exe"
5050
}
51-
52-
if ("${{ parameters.vmImageName }}" -like 'macos-*')
53-
{
54-
sudo installer -store -pkg "${pwsh_download}" -target /
55-
Get-ChildItem /Applications | Write-Verbose
56-
$powerShellPreview = Join-Path "/Applications" "pwsh-preview" "pwsh"
57-
}
58-
if ("${{ parameters.vmImageName }}" -like 'ubuntu-*')
51+
if ("${{ parameters.vmImageName }}" -like 'ubuntu-*' -or "${{ parameters.vmImageName }}" -like 'macos-*')
5952
{
60-
$url = "https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-linux-x64.tar.gz"
6153
gunzip -d $downloadDestination
6254
$downloadDestination = $downloadDestination.Replace(".gz", "")
6355
mkdir "pwsh-preview"
@@ -81,6 +73,8 @@ jobs:
8173
if ("${{ parameters.vmImageName }}" -like 'windows-*')
8274
{
8375
[System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+';C:\Program Files\7-zip')
76+
$content = 7z.exe a archive.zip .azdevops
77+
$content | Write-Verbose -Verbose
8478
}
8579
"$(PowerShellPreviewExecutablePath) .azdevops/RunTests.ps1" | Invoke-Expression
8680
displayName: Run Tests

Tests/Compress-Archive.Tests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ BeforeDiscovery {
5858
}
5959

6060
It "Validate errors from Compress-Archive when invalid path is supplied for Path or LiteralPath parameters" -ForEach @(
61-
@{ Path = "Env:/Path" }
62-
@{ Path = @("TestDrive:/", "Env:/Path") }
61+
@{ Path = "Env:/PWD" }
62+
@{ Path = @("TestDrive:/", "Env:/PWD") }
6363
) -Tag this1 {
6464
$DestinationPath = "TestDrive:/archive2.zip"
6565

0 commit comments

Comments
 (0)