File tree Expand file tree Collapse file tree 5 files changed +40
-54
lines changed
Expand file tree Collapse file tree 5 files changed +40
-54
lines changed Original file line number Diff line number Diff line change @@ -22,10 +22,6 @@ skip_commits:
2222environment :
2323 PsgKey :
2424 secure : tlhLuUS6x8FcP159+X/EIBDlj9m+u5KCTTuqwzsiNHlPX6K4AolpaZcfAP4ClOdB
25- matrix :
26- - DOCKER_IMAGE :
27- - DOCKER_IMAGE : nanoserver
28- - DOCKER_IMAGE : windowsservercore
2925
3026cache :
3127 - test\download-cache -> .appveyor.yml
@@ -36,23 +32,11 @@ cache:
3632build : off
3733
3834install :
39- - ps : |
40- if ($null -eq $Env:DOCKER_IMAGE -or $Env:DOCKER_IMAGE -eq '') {
41- .\test\setup.ps1
42- } else {
43- & ".\test\Dockerfile.$Env:DOCKER_IMAGE.ps1"
44- }
45-
35+ - ps : .\test\setup.ps1
4636test_script :
4737 - ps : |
48- if ($null -eq $Env:DOCKER_IMAGE -or $Env:DOCKER_IMAGE -eq '') {
49- $pesterResult = .\test\pester.ps1
50- $failCount = $pesterResult.FailedCount
51- } else {
52- $volume="$($Env:APPVEYOR_BUILD_FOLDER):C:\App"
53- docker run --rm --volume $volume --workdir C:\App --env "PM_TEST_DOCKER=1" phpmanager/test powershell.exe 'Set-Location -LiteralPath C:\App; $pesterResult=.\test\pester.ps1; exit $pesterResult.FailedCount'
54- $failCount = $LASTEXITCODE
55- }
38+ $pesterResult = .\test\pester.ps1
39+ $failCount = $pesterResult.FailedCount
5640 (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path -LiteralPath .\TestsResults.xml))
5741 if ($failCount -ne 0) {
5842 throw "$failCount tests failed!"
Original file line number Diff line number Diff line change 5757 if ($pesterResult.FailedCount -ne 0) {
5858 throw "$($pesterResult.FailedCount) tests failed!"
5959 }
60+ docker :
61+ strategy :
62+ matrix :
63+ docker-image :
64+ - nanoserver
65+ - windowsservercore
66+ name : Docker (${{ matrix.docker-image }})
67+ runs-on : windows-latest
68+ steps :
69+ - name : Enabling Windows containers
70+ run : " & 'C:\\ Program Files\\ Docker\\ DockerCli.exe' -SwitchWindowsEngine"
71+ - name : Checkout
72+ uses : actions/checkout@v2
73+ with :
74+ fetch-depth : 1
75+ - name : Prepare files for Docker image
76+ run : .\test\Prepare-Dockerfile.ps1 "${{ matrix.docker-image }}"
77+ - name : Build Docker image
78+ run : docker build --tag phpmanager/test .\test\docker-build
79+ - name : Test
80+ run : |
81+ docker run --rm --volume "$($Env:GITHUB_WORKSPACE):C:\App" --workdir C:\App --env "PM_TEST_DOCKER=1" phpmanager/test powershell.exe 'pesterResult=.\test\pester.ps1; exit $pesterResult.FailedCount'
82+ $failCount = $LASTEXITCODE
83+ if ($failCount -ne 0) {
84+ throw "$failCount tests failed!"
85+ }
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1+ param ([string ] $DockerImage )
2+
3+ $dockerBuildPath = Join-Path - Path $PSScriptRoot - ChildPath docker- build
4+ if (-Not (Test-Path - LiteralPath $dockerBuildPath )) {
5+ New-Item - ItemType Directory - Path $dockerBuildPath | Out-Null
6+ }
7+ Copy-Item - LiteralPath " $ ( $Env: SystemRoot ) \System32\vcruntime140.dll" - Destination $dockerBuildPath
8+ Copy-Item - LiteralPath " $ ( $Env: SystemRoot ) \System32\vcomp140.dll" - Destination $dockerBuildPath
9+ Copy-Item - LiteralPath (Join-Path - Path $PSScriptRoot - ChildPath setup- nodejs.ps1) - Destination $dockerBuildPath
10+ Copy-Item - LiteralPath (Join-Path - Path $PSScriptRoot - ChildPath setup.ps1) - Destination $dockerBuildPath
11+ Copy-Item - LiteralPath (Join-Path - Path $PSScriptRoot - ChildPath " Dockerfile.$DockerImage " ) - Destination (Join-Path - Path $dockerBuildPath - ChildPath Dockerfile)
You can’t perform that action at this time.
0 commit comments