@@ -126,19 +126,24 @@ jobs:
126
126
- name : Install Visual Studio Build Tools
127
127
if : ${{ !inputs.enable_windows_docker }}
128
128
run : |
129
- Invoke-WebRequest -Uri https://raw.githubusercontent.com/award999/github-workflows/refs/heads/dockerless-windows/.github/workflows/scripts/windows/install-vsb.ps1 -OutFile install-vsb.ps1
130
- . . \install-vsb.ps1
131
- del . \install-vsb.ps1
129
+ Invoke-WebRequest -Uri https://raw.githubusercontent.com/award999/github-workflows/refs/heads/dockerless-windows/.github/workflows/scripts/windows/install-vsb.ps1 -OutFile $env:TEMP\ install-vsb.ps1
130
+ . $env:TEMP \install-vsb.ps1
131
+ del $env:TEMP \install-vsb.ps1
132
132
- name : Install Swift
133
133
if : ${{ !inputs.enable_windows_docker }}
134
134
run : |
135
- Invoke-WebRequest -Uri https://raw.githubusercontent.com/award999/github-workflows/refs/heads/dockerless-windows/.github/workflows/scripts/windows/swift/install-swift.ps1 -OutFile install-swift.ps1
136
- Invoke-WebRequest -Uri https://raw.githubusercontent.com/award999/github-workflows/refs/heads/dockerless-windows/.github/workflows/scripts/windows/swift/install-swift-${{ matrix.swift_version }}.ps1 -OutFile install-swift-${{ matrix.swift_version }}.ps1
137
- . . \install-swift-${{ matrix.swift_version }}.ps1
138
- del . \install-swift*.ps1
135
+ Invoke-WebRequest -Uri https://raw.githubusercontent.com/award999/github-workflows/refs/heads/dockerless-windows/.github/workflows/scripts/windows/swift/install-swift.ps1 -OutFile $env:TEMP\ install-swift.ps1
136
+ Invoke-WebRequest -Uri https://raw.githubusercontent.com/award999/github-workflows/refs/heads/dockerless-windows/.github/workflows/scripts/windows/swift/install-swift-${{ matrix.swift_version }}.ps1 -OutFile $env:TEMP\ install-swift-${{ matrix.swift_version }}.ps1
137
+ . $env:TEMP \install-swift-${{ matrix.swift_version }}.ps1
138
+ del $env:TEMP \install-swift*.ps1
139
139
- name : Create test script
140
140
run : |
141
141
mkdir $env:TEMP\test-script
142
+ if ("${{ inputs.enable_windows_docker }}" -eq "true") {
143
+ $Source = C:\source
144
+ } else {
145
+ $Source = $env:GITHUB_WORKSPACE
146
+ }
142
147
echo @'
143
148
Set-PSDebug -Trace 1
144
149
@@ -152,12 +157,12 @@ jobs:
152
157
}
153
158
Invoke-Program swift --version
154
159
Invoke-Program swift test --version
155
- Invoke-Program cd C:\source\
160
+ Invoke-Program cd $Source
156
161
${{ inputs.windows_pre_build_command }}
157
162
Invoke-Program ${{ inputs.windows_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
158
163
'@ >> $env:TEMP\test-script\run.ps1
159
164
# Docker build
160
- - name : Build / Test
165
+ - name : Docker Build / Test
161
166
timeout-minutes : 60
162
167
if : ${{ inputs.enable_windows_docker }}
163
168
run : |
@@ -166,4 +171,7 @@ jobs:
166
171
- name : Build / Test
167
172
timeout-minutes : 60
168
173
if : ${{ !inputs.enable_windows_docker }}
169
- run : powershell.exe -NoLogo -File $env:TEMP\test-script\run.ps1
174
+ run : |
175
+ Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
176
+ RefreshEnv
177
+ powershell.exe -NoLogo -File $env:TEMP\test-script\run.ps1; exit $LastExitCode
0 commit comments