@@ -384,7 +384,7 @@ jobs:
384
384
- name : Upload artifacts
385
385
uses : actions/upload-artifact@v3
386
386
with :
387
- name : tmp. linux-build
387
+ name : linux-build
388
388
path : |
389
389
linux-build
390
390
@@ -399,7 +399,11 @@ jobs:
399
399
- name : Download artifacts
400
400
uses : actions/download-artifact@v3
401
401
with :
402
- name : tmp.linux-build
402
+ name : linux-build
403
+
404
+ - name : Remove symbols
405
+ run : |
406
+ rm tar/*symbols*
403
407
404
408
- uses : azure/login@v1
405
409
with :
@@ -423,6 +427,12 @@ jobs:
423
427
run : |
424
428
python .github/run_esrp_signing.py deb $env:LINUX_KEY_CODE $env:LINUX_OP_CODE
425
429
python .github/run_esrp_signing.py tar $env:LINUX_KEY_CODE $env:LINUX_OP_CODE
430
+
431
+ - name : Re-name tarball signature file
432
+ shell : bash
433
+ run : |
434
+ signaturepath=$(find signed/*.tar.gz)
435
+ mv "$signaturepath" "${signaturepath%.tar.gz}.asc"
426
436
427
437
- name : Upload signed tarball and Debian package
428
438
uses : actions/upload-artifact@v3
@@ -624,19 +634,27 @@ jobs:
624
634
- os : ubuntu-latest
625
635
artifact : linux-sign
626
636
command : git-credential-manager
637
+ description : debian
638
+ - os : ubuntu-latest
639
+ artifact : linux-build
640
+ command : git-credential-manager
641
+ description : tarball
627
642
- os : macos-latest
628
643
artifact : osx-x64-sign
629
644
command : git-credential-manager
645
+ description : osx-x64
630
646
- os : windows-latest
631
647
artifact : win-sign
632
648
# Even when a standalone GCM version is installed, GitHub actions
633
649
# runners still only recognize the version bundled with Git for
634
650
# Windows due to its placement on the PATH. For this reason, we use
635
651
# the full path to our installation to validate the Windows version.
636
652
command : " $PROGRAMFILES (x86)/Git Credential Manager/git-credential-manager.exe"
653
+ description : windows
637
654
- os : ubuntu-latest
638
655
artifact : dotnet-tool-sign
639
656
command : git-credential-manager
657
+ description : dotnet-tool
640
658
runs-on : ${{ matrix.component.os }}
641
659
needs : [ osx-sign, win-sign, linux-sign, dotnet-tool-sign ]
642
660
steps :
@@ -654,7 +672,7 @@ jobs:
654
672
name : ${{ matrix.component.artifact }}
655
673
656
674
- name : Install Windows
657
- if : contains(matrix.component.os , 'windows')
675
+ if : contains(matrix.component.description , 'windows')
658
676
shell : pwsh
659
677
run : |
660
678
$exePaths = Get-ChildItem -Path ./signed/*.exe | %{$_.FullName}
@@ -663,22 +681,30 @@ jobs:
663
681
Start-Process -Wait -FilePath "$exePath" -ArgumentList "/SILENT /VERYSILENT /NORESTART"
664
682
}
665
683
666
- - name : Install Linux
667
- if : contains(matrix.component.os , 'ubuntu') && contains(matrix.component.artifact, 'linux ')
684
+ - name : Install Linux (Debian package)
685
+ if : contains(matrix.component.description , 'debian ')
668
686
run : |
669
687
debpath=$(find ./*.deb)
670
688
sudo apt install $debpath
671
689
"${{ matrix.component.command }}" configure
690
+
691
+ - name : Install Linux (tarball)
692
+ if : contains(matrix.component.description, 'tarball')
693
+ run : |
694
+ # Ensure we find only the source tarball, not the symbols
695
+ tarpath=$(find ./tar -name '*[[:digit:]].tar.gz')
696
+ tar -xvf $tarpath -C /usr/local/bin
697
+ "${{ matrix.component.command }}" configure
672
698
673
699
- name : Install macOS
674
- if : contains(matrix.component.os , 'macos ')
700
+ if : contains(matrix.component.description , 'osx-x64 ')
675
701
run : |
676
702
# Only validate x64, given arm64 agents are not available
677
703
pkgpath=$(find ./*.pkg)
678
704
sudo installer -pkg $pkgpath -target /
679
705
680
706
- name : Install .NET tool
681
- if : contains(matrix.component.os, 'ubuntu') && contains(matrix.component.artifact , 'dotnet-tool')
707
+ if : contains(matrix.component.description , 'dotnet-tool')
682
708
run : |
683
709
nupkgpath=$(find ./*.nupkg)
684
710
dotnet tool install -g --add-source $(dirname "$nupkgpath") git-credential-manager
@@ -787,6 +813,7 @@ jobs:
787
813
uploadDirectoryToRelease('osx-payload-and-symbols'),
788
814
789
815
// Upload Linux artifacts
816
+ uploadDirectoryToRelease('linux-build/tar'),
790
817
uploadDirectoryToRelease('linux-sign'),
791
818
792
819
// Upload .NET tool package
0 commit comments