Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, windows-2022]
os: [windows-2022, windows-latest]
tag: [General, Unit]
include:
- tag: General
Expand Down Expand Up @@ -51,13 +51,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, windows-2022]
os: [windows-2022, windows-latest]
tag: [Basic]
pwshlib_source: [forge, git]
include:
- pwshlib_source: forge
pwshlib_repo: "puppetlabs/pwshlib"
pwshlib_ref: "latest" # Change to a specific version if desired
pwshlib_ref: "latest" # Track latest release
results_file: Acceptance.Forge.Results.xml
- pwshlib_source: git
pwshlib_repo: "https://github.com/puppetlabs/ruby-pwsh.git" # Change to another fork if desired
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, windows-2022]
os: [windows-2022, windows-latest]
tag: [General, Unit]
include:
- tag: General
Expand Down Expand Up @@ -47,13 +47,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, windows-2022]
os: [windows-2022, windows-latest]
tag: [Basic]
pwshlib_source: [forge, git]
include:
- pwshlib_source: forge
pwshlib_repo: "puppetlabs/pwshlib"
pwshlib_ref: "latest" # Change to a specific version if desired
pwshlib_ref: "latest" # Track latest release
results_file: Acceptance.Forge.Results.xml
- pwshlib_source: git
pwshlib_repo: "https://github.com/puppetlabs/ruby-pwsh.git" # Change to another fork if desired
Expand Down
4 changes: 2 additions & 2 deletions acceptance/Basic.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Describe 'Acceptance Tests: Basic' -Tag @('Acceptance', 'Basic') {
' dsc_network_access_allow_anonymous_sid_name_translation => "Disabled",'
"}`n"
) -join "`n"
PdkSuccessFilterScript = { $_ -match 'Updating: Finished' }
PdkSuccessFilterScript = { $_ -match '(Updating: Finished|Applied catalog in)' }
PdkErrorFilterScript = { $_ -match 'Error' }
}
@{
Expand All @@ -231,7 +231,7 @@ Describe 'Acceptance Tests: Basic' -Tag @('Acceptance', 'Basic') {
' dsc_network_access_allow_anonymous_sid_name_translation => "Disabled",'
"}`n"
) -join "`n"
PdkSuccessFilterScript = { $_ -match 'Updating: Finished' }
PdkSuccessFilterScript = { $_ -match '(Updating: Finished|Applied catalog in)' }
PdkErrorFilterScript = { $_ -match 'Error' }
}
@{
Expand Down