84
84
strategy :
85
85
fail-fast : false
86
86
matrix :
87
- swift_version : ['5.9', '6.0 ', 'nightly ', 'nightly-6.0 ']
87
+ swift_version : ['5.9', '5.10 ', '6.0 ', 'nightly']
88
88
exclude :
89
89
- ${{ fromJson(inputs.windows_exclude_swift_versions) }}
90
90
steps :
@@ -103,18 +103,16 @@ jobs:
103
103
- name : Create test script
104
104
run : |
105
105
mkdir $env:TEMP\test-script
106
+ echo 'Set-PSDebug -Trace 1' >> $env:TEMP\test-script\run.ps1
107
+ echo '$ErrorActionPreference = "Stop"' >> $env:TEMP\test-script\run.ps1
108
+ echo 'swift --version' >> $env:TEMP\test-script\run.ps1
109
+ echo 'swift test --version' >> $env:TEMP\test-script\run.ps1
110
+ echo 'cd C:\source\' >> $env:TEMP\test-script\run.ps1
106
111
echo @'
107
- Set-PSDebug -Trace 1
108
- $ErrorActionPreference = "Stop"
109
112
${{ inputs.windows_pre_build_command }}
110
- '@ >> $env:TEMP\test-script\pre-build.ps1
111
-
112
- echo 'swift --version || (exit /b 1)' >> $env:TEMP\test-script\run.cmd
113
- echo 'swift test --version || (exit /b 1)' >> $env:TEMP\test-script\run.cmd
114
- echo 'cd C:\source\ || (exit /b 1)' >> $env:TEMP\test-script\run.cmd
115
- echo 'powershell.exe -NoLogo -File C:\test-script\pre-build.ps1 || (exit /b 1)' >> $env:TEMP\test-script\run.cmd
116
- echo '${{ inputs.windows_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }} || (exit /b 1)' >> $env:TEMP\test-script\run.cmd
113
+ '@ >> $env:TEMP\test-script\run.ps1
114
+ echo '${{ inputs.windows_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}' >> $env:TEMP\test-script\run.ps1
117
115
- name : Build / Test
118
116
timeout-minutes : 60
119
117
run : |
120
- docker run -v ${{ github.workspace }}:C:\source -v $env:TEMP\test-script:C:\test-script ${{ steps.pull_docker_image.outputs.image }} C:\test-script\run.cmd
118
+ docker run -v ${{ github.workspace }}:C:\source -v $env:TEMP\test-script:C:\test-script ${{ steps.pull_docker_image.outputs.image }} powershell.exe -NoLogo -File C:\test-script\run.ps1
0 commit comments