@@ -193,9 +193,28 @@ jobs:
193
193
with :
194
194
name : pkg-x86_64
195
195
path : artifacts
196
- installer-x86_64 :
196
+ artifacts :
197
197
runs-on : windows-latest
198
- needs : pkg-x86_64
198
+ needs : pkg
199
+ strategy :
200
+ matrix :
201
+ artifact :
202
+ - name : installer
203
+ fileprefix : Git
204
+ fileextension : exe
205
+ - name : portable
206
+ fileprefix : PortableGit
207
+ fileextension : exe
208
+ - name : archive
209
+ fileprefix : Git
210
+ fileextension : tar.bz2
211
+ - name : mingit
212
+ fileprefix : MinGit
213
+ fileextension : zip
214
+ - name : mingit-busybox
215
+ fileprefix : MinGit
216
+ fileextension : zip
217
+ fail-fast : false
199
218
env :
200
219
MSYSTEM : MINGW64
201
220
steps :
@@ -241,13 +260,23 @@ jobs:
241
260
echo -n "$CODESIGN_P12" | tr % '\n' | base64 -d >home/.sig/codesign.p12 &&
242
261
echo -n "$CODESIGN_PASS" >home/.sig/codesign.pass &&
243
262
git config --global alias.signtool '!sh "/usr/src/build-extra/signtool.sh"'
244
- - name : Build 64-bit installer
263
+ - name : Build 64-bit ${{matrix.artifact.name}}
245
264
shell : powershell
246
265
run : |
247
266
& .\git-sdk-64-build-installers\usr\bin\bash.exe -lc @"
248
267
set -x
249
- /usr/src/build-extra/please.sh make_installers_from_mingw_w64_git --version=`$(cat pkg-x86_64/ver) -o artifacts --installer --pkg=pkg-x86_64/mingw-w64-x86_64-git-[0-9]*.tar.xz --pkg=pkg-x86_64/mingw-w64-x86_64-git-doc-html-[0-9]*.tar.xz &&
250
- openssl dgst -sha256 artifacts/Git-*.exe | sed \"s/.* //\" >artifacts/sha-256.txt &&
268
+ /usr/src/build-extra/please.sh make_installers_from_mingw_w64_git --version=`$(cat pkg-x86_64/ver) -o artifacts --${{matrix.artifact.name}} --pkg=pkg-x86_64/mingw-w64-x86_64-git-[0-9]*.tar.xz --pkg=pkg-x86_64/mingw-w64-x86_64-git-doc-html-[0-9]*.tar.xz &&
269
+ if test portable = '${{matrix.artifact.name}}' && test -n \"`$(git config alias.signtool)\"
270
+ then
271
+ git signtool artifacts/PortableGit-*.exe
272
+ fi &&
273
+ openssl dgst -sha256 artifacts/${{matrix.artifact.fileprefix}}-*.${{matrix.artifact.fileextension}} | sed \"s/.* //\" >artifacts/sha-256.txt
274
+ "@
275
+ - name : Copy package-versions and pdbs
276
+ if : matrix.artifact.name == 'installer'
277
+ shell : powershell
278
+ run : |
279
+ & .\git-sdk-64-build-installers\usr\bin\bash.exe -lc @"
251
280
cp /usr/src/build-extra/installer/package-versions.txt artifacts/ &&
252
281
253
282
a=`$PWD/artifacts &&
@@ -261,8 +290,8 @@ jobs:
261
290
if : always()
262
291
shell : bash
263
292
run : rm -rf home
264
- - name : Publish installer -x86_64
293
+ - name : Publish ${{matrix.artifact.name}} -x86_64
265
294
uses : actions/upload-artifact@v1
266
295
with :
267
- name : installer -x86_64
296
+ name : ${{matrix.artifact.name}} -x86_64
268
297
path : artifacts
0 commit comments