Skip to content
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

try on pwsh #61

Merged
merged 22 commits into from
Oct 9, 2024
Merged

try on pwsh #61

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c19f403
try on pwsh
ronnypolley Oct 9, 2024
9bdb71b
update pester version
ronnypolley Oct 9, 2024
50aaa8a
try without mac os
ronnypolley Oct 9, 2024
5347ae7
try using my own random files
ronnypolley Oct 9, 2024
d00af9f
use backslash
ronnypolley Oct 9, 2024
619041e
debug env
ronnypolley Oct 9, 2024
63513de
use .net method to get temp path
ronnypolley Oct 9, 2024
33024fd
debug folder creation
ronnypolley Oct 9, 2024
9188103
need -Force for hidden folders
ronnypolley Oct 9, 2024
87e16e0
do not fail fast
ronnypolley Oct 9, 2024
8edfcd5
print out env
ronnypolley Oct 9, 2024
82ca43e
need a force delete
ronnypolley Oct 9, 2024
b493ea3
change get-item().delete to remove-item
ronnypolley Oct 9, 2024
3bb8952
add a test around the link
ronnypolley Oct 9, 2024
731f971
change handling of links on non windows platforms
ronnypolley Oct 9, 2024
2c801d8
can not use $isWindows
ronnypolley Oct 9, 2024
c751acb
use $env:OS for determining windows
ronnypolley Oct 9, 2024
7339b58
use force for finding hidden path
ronnypolley Oct 9, 2024
9bb7704
use new-item to create symlink
ronnypolley Oct 9, 2024
17145d9
revert old "if" change
ronnypolley Oct 9, 2024
dedec90
remove unused -force
ronnypolley Oct 9, 2024
1b77976
use new-item for linking
ronnypolley Oct 9, 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
60 changes: 31 additions & 29 deletions .github/workflows/pester.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
name: Pester
on: [push, pull_request, workflow_dispatch]
jobs:
# test-pwsh:
# strategy:
# matrix:
# platform: [ubuntu-latest, macos-latest, windows-latest]
# runs-on: ${{ matrix.platform }}
# steps:
# - uses: actions/checkout@v4
# - name: Run Pester tests (pwsh)
# run: |
# Write-host $PSVersionTable.PSVersion.Major $PSVersionTable.PSRemotingProtocolVersion.Minor
# Install-Module -Name Pester -RequiredVersion 5.2.2 -Confirm:$false -Force
# Set-Location -Path .\Tests\
# Invoke-Pester
# if ($Error[0].Fullyqualifiederrorid -eq 'PesterAssertionFailed') {exit 1}
# shell: pwsh
test-pwsh:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v4
- name: Run Pester tests (pwsh)
run: |
dir env:
Write-host $PSVersionTable.PSVersion.Major $PSVersionTable.PSRemotingProtocolVersion.Minor
Install-Module -Name Pester -RequiredVersion 5.6.1 -Confirm:$false -Force
Set-Location -Path .\Tests\
Invoke-Pester
if ($Error[0].Fullyqualifiederrorid -eq 'PesterAssertionFailed') {exit 1}
shell: pwsh

test-posh:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Run Pester tests (PowerShell)
run: |
Write-host $PSVersionTable.PSVersion.Major $PSVersionTable.PSRemotingProtocolVersion.Minor
Install-Module -Name Pester -RequiredVersion 5.6.1 -Confirm:$false -Force
$pesterConfig = New-PesterConfiguration
$pesterConfig.CodeCoverage.Enabled = $true
Set-Location -Path .\Tests\
Invoke-Pester -Configuration $pesterConfig
if ($Error[0].Fullyqualifiederrorid -eq 'PesterAssertionFailed') {exit 1}
shell: powershell
test-posh:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Run Pester tests (PowerShell)
run: |
Write-host $PSVersionTable.PSVersion.Major $PSVersionTable.PSRemotingProtocolVersion.Minor
Install-Module -Name Pester -RequiredVersion 5.6.1 -Confirm:$false -Force
$pesterConfig = New-PesterConfiguration
$pesterConfig.CodeCoverage.Enabled = $true
Set-Location -Path .\Tests\
Invoke-Pester -Configuration $pesterConfig
if ($Error[0].Fullyqualifiederrorid -eq 'PesterAssertionFailed') {exit 1}
shell: powershell
7 changes: 5 additions & 2 deletions PSSDKMan/Utils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,11 @@
if ( Test-Path $Link ) {
(Get-Item $Link).Delete()
}

Invoke-Expression -Command "cmd.exe /c mklink /J '$Link' '$Target'" | Out-Null
if ($Env:OS -eq "Windows_NT") {
Invoke-Expression -Command "cmd.exe /c mklink /J '$Link' '$Target'" | Out-Null
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
} else {
New-Item -Path $Link -ItemType SymbolicLink -Value $Target | Out-Null
}
}

function Get-Online-Mode() {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Commands.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
BeforeAll {
$Script:PSDK_FORCE_OFFLINE = $true
Mock-PSDK-Dir
Remove-Item $Global:PSDK_DIR -Recurse
Remove-Item $Global:PSDK_DIR -Recurse -Force
Dismissed Show dismissed Hide dismissed
Mock Initialize-Posh-SDK -verifiable
Mock Initialize-Candidate-Cache -verifiable
Mock Show-Help
Expand Down
9 changes: 6 additions & 3 deletions Tests/TestUtils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@

function Mock-PSDK-Dir {
$Script:backup_PSDK_DIR = $Global:PSDK_DIR
New-Item -ItemType Directory "TestDrive:.posh-sdk" | Out-Null
$Global:PSDK_DIR = (Get-Item "TestDrive:.posh-sdk").FullName
$randomName = (-join ((65..90) + (97..122) | Get-Random -Count 5 | % {[char]$_}))
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed

Check warning

Code scanning / PSScriptAnalyzer

'%' is an alias of 'ForEach-Object'. Alias can introduce possible problems and make scripts hard to maintain. Please consider changing alias to its full content. Warning

'%' is an alias of 'ForEach-Object'. Alias can introduce possible problems and make scripts hard to maintain. Please consider changing alias to its full content.
$tempDir = [System.IO.Path]::GetTempPath()
$testPath = "$tempDir\$randomName"
New-Item -ItemType Directory "$testPath\.posh-sdk"
$Global:PSDK_DIR = (Get-Item "$testPath\.posh-sdk" -Force).FullName
Dismissed Show dismissed Hide dismissed
New-Item -ItemType Directory "$Global:PSDK_DIR\grails" | Out-Null
}

Expand Down Expand Up @@ -54,4 +57,4 @@

function Reset-Dispatcher-Test {
Reset-PSDK-Dir
}
}
6 changes: 4 additions & 2 deletions Tests/Utils.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,9 @@
}

AfterAll {
(Get-Item "$Global:PSDK_DIR\grails\bla").Delete()
if (Test-Path "$Global:PSDK_DIR\grails\bla") {
Fixed Show fixed Hide fixed
Remove-Item -Path "$Global:PSDK_DIR\grails\bla" -Recurse
Fixed Show fixed Hide fixed
}
Reset-PSDK-Dir
}
}
Expand All @@ -781,7 +783,7 @@
}

AfterAll {
(Get-Item "$Global:PSDK_DIR\grails\bla").Delete()
(Get-Item "$Global:PSDK_DIR\grails\bla" -Force).Delete()
Fixed Show fixed Hide fixed
Reset-PSDK-Dir
}
}
Expand Down