@@ -145,13 +145,6 @@ jobs:
145
145
## Unzip and remove the artifact
146
146
unzip artifacts.zip
147
147
rm artifacts.zip
148
- - name : generate Visual Studio solution
149
- shell : powershell
150
- run : |
151
- & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @"
152
- make NDEBUG=1 DEVELOPER=1 vcxproj
153
- "@
154
- if (!$?) { exit(1) }
155
148
- name : download vcpkg artifacts
156
149
shell : powershell
157
150
run : |
@@ -163,6 +156,17 @@ jobs:
163
156
Remove-Item compat.zip
164
157
- name : add msbuild to PATH
165
158
159
+ - name : copy dlls to root
160
+ shell : powershell
161
+ run : |
162
+ & compat\vcbuild\vcpkg_copy_dlls.bat release
163
+ if (!$?) { exit(1) }
164
+ - name : generate Visual Studio solution
165
+ shell : bash
166
+ run : |
167
+ cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
168
+ -DIconv_LIBRARY=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/lib/libiconv.lib -DIconv_INCLUDE_DIR=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/include \
169
+ -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
166
170
- name : MSBuild
167
171
run : msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
168
172
- name : bundle artifact tar
@@ -171,8 +175,6 @@ jobs:
171
175
MSVC : 1
172
176
VCPKG_ROOT : ${{github.workspace}}\compat\vcbuild\vcpkg
173
177
run : |
174
- & compat\vcbuild\vcpkg_copy_dlls.bat release
175
- if (!$?) { exit(1) }
176
178
& git-sdk-64-minimal\usr\bin\bash.exe -lc @"
177
179
mkdir -p artifacts &&
178
180
eval \"`$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts 2>&1 | grep ^tar)\"
@@ -203,7 +205,7 @@ jobs:
203
205
- name : extract build artifacts
204
206
shell : bash
205
207
run : tar xf artifacts.tar.gz
206
- - name : test (parallel)
208
+ - name : test
207
209
shell : powershell
208
210
env :
209
211
MSYSTEM : MINGW64
@@ -214,12 +216,19 @@ jobs:
214
216
# Let Git ignore the SDK and the test-cache
215
217
printf '%s\n' /git-sdk-64-minimal/ /test-cache/ >>.git/info/exclude
216
218
217
- cd t &&
218
- PATH=\"`$PWD/helper:`$PATH\" &&
219
- test-tool.exe run-command testsuite --jobs=10 -V -x --write-junit-xml \
220
- `$(test-tool.exe path-utils slice-tests \
221
- ${{matrix.nr}} 10 t[0-9]*.sh)
219
+ ci/run-test-slice.sh ${{matrix.nr}} 10
222
220
"@
221
+ - name : ci/print-test-failures.sh
222
+ if : failure()
223
+ shell : powershell
224
+ run : |
225
+ & .\git-sdk-64-minimal\usr\bin\bash.exe -lc ci/print-test-failures.sh
226
+ - name : Upload failed tests' directories
227
+ if : failure() && env.FAILED_TEST_ARTIFACTS != ''
228
+ uses : actions/upload-artifact@v1
229
+ with :
230
+ name : failed-tests-windows
231
+ path : ${{env.FAILED_TEST_ARTIFACTS}}
223
232
regular :
224
233
needs : ci-config
225
234
if : needs.ci-config.outputs.enabled == 'yes'
0 commit comments