Skip to content

Commit

Permalink
Update GitHub Actions CI
Browse files Browse the repository at this point in the history
  • Loading branch information
andyleejordan committed Jul 31, 2024
1 parent ad9e094 commit 6bef336
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
merge_group:
types: [ checks_requested ]
Expand All @@ -18,7 +17,6 @@ jobs:
runs-on: ${{ matrix.os }}
env:
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_GENERATE_ASPNET_CERTIFICATE: false
steps:
- uses: actions/checkout@v4
Expand All @@ -27,7 +25,7 @@ jobs:
dotnet-version: 8.x
- run: ./tools/installPSResources.ps1
shell: pwsh
- run: ./build.ps1 -Build && Invoke-ModuleTests -Type Functional
- run: Invoke-Build -Configuration Release -Task Build, Package, Test
shell: pwsh
- uses: actions/upload-artifact@v4
if: always()
Expand All @@ -38,4 +36,4 @@ jobs:
if: always()
with:
name: SecretManagement-tests-${{ matrix.os }}
path: test/result.pester.xml
path: testResults.xml
2 changes: 1 addition & 1 deletion SecretManagement.build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ task PackageLibrary -If { $Configuration -eq "Release" } {
}

task Test {
Invoke-Pester -CI
Invoke-Pester -CI -Output Diagnostic
}

task Build BuildModule, BuildDocs
Expand Down
6 changes: 4 additions & 2 deletions tools/installPSResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ if ($PSVersionTable.PSVersion.Major -lt 6) {
}

# TODO: Switch to Install-PSResource when CI uses PowerShell 7.4
Install-Module -Name PowerShellGet -AllowPrerelease -Scope CurrentUser -Force
Install-Module -Name Pester -RequiredVersion 4.10.1 -Scope CurrentUser -Force -SkipPublisherCheck
Install-Module -Name InvokeBuild -Scope CurrentUser
Install-Module -Name platyPS -Scope CurrentUser
Install-Module -Name Microsoft.PowerShell.PSResourceGet -Scope CurrentUser
Install-Module -Name Pester -Scope CurrentUser

0 comments on commit 6bef336

Please sign in to comment.