Merge pull request cli#201 from github/cleanup-scripts

mislav · web-flow · commit 2053809436f9 · 2020-01-08T17:22:46.000+01:00
Cleanup release scripts
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -12,7 +12,6 @@ jobs:
         uses: actions/setup-go@v1
         with:
           go-version: 1.13
-        id: go
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v1
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -12,7 +12,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Set up Go 1.13
-        id: go
         uses: actions/setup-go@v1
         with:
           go-version: 1.13
@@ -34,7 +33,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Set up Go 1.13
-        id: go
         uses: actions/setup-go@v1
         with:
           go-version: 1.13
@@ -51,14 +49,16 @@ jobs:
         with:
           exe: ${{ steps.download_exe.outputs.exe }}
       - name: Obtain signing cert
+        id: obtain_cert
         env:
           DESKTOP_CERT_TOKEN: ${{ secrets.DESKTOP_CERT_TOKEN }}
-        run: .\setup-windows-certificate.ps1
-        shell: powershell
+        run: .\script\setup-windows-certificate.ps1
       - name: Sign MSI
         env:
           GITHUB_CERT_PASSWORD: ${{ secrets.GITHUB_CERT_PASSWORD }}
-        run: .\sign.ps1 -Certificate "windows-certificate.pfx" -Executable "${{ steps.buildmsi.outputs.msi }}"
+        run: |
+          .\script\sign.ps1 -Certificate "${{ steps.obtain_cert.outputs.cert-file }}" `
+            -Executable "${{ steps.buildmsi.outputs.msi }}"
       - name: Upload MSI
         uses: ./.github/actions/upload-msi
         env:
diff --git a/script/setup-windows-certificate.ps1 b/script/setup-windows-certificate.ps1
@@ -1,9 +1,12 @@
 $scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
+$certFile = "$scriptPath\windows-certificate.pfx"
 
 $headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
 $headers.Add("Authorization", "token $env:DESKTOP_CERT_TOKEN")
 $headers.Add("Accept", 'application/vnd.github.v3.raw')
 
 Invoke-WebRequest 'https://api.github.com/repos/desktop/desktop-secrets/contents/windows-certificate.pfx' `
               -Headers $headers `
-              -OutFile "$scriptPath\windows-certificate.pfx"
+              -OutFile "$certFile"
+
+Write-Output "::set-output name=cert-file::$certFile"
diff --git a/script/sign.ps1 b/script/sign.ps1
@@ -10,4 +10,8 @@ $thumbprint = "fb713a60a7fa79dfc03cb301ca05d4e8c1bdd431"
 $passwd = $env:GITHUB_CERT_PASSWORD
 $ProgramName = "GitHub CLI"
 
-& .\signtool.exe sign /d $ProgramName /f $Certificate /p $passwd /sha1 $thumbprint /fd sha256 /tr http://timestamp.digicert.com /td sha256 /v $Executable
+$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
+
+& $scriptPath\signtool.exe sign /d $ProgramName /f $Certificate /p $passwd `
+    /sha1 $thumbprint /fd sha256 /tr http://timestamp.digicert.com /td sha256 /v `
+    $Executable
diff --git a/script/signtool.exe b/script/signtool.exe
