chore(ci): Additional fixes for codesigning/publish on windows (onivi…

…m#3786) - The new codesigning certificate requires a newer version of `signtool` - need to update the build VM - `signtool` on `windows-2019` is in a different location than `vs2017-win2016`
tofulm · Jul 28, 2021 · 9c4afae · 9c4afae
1 parent 0cd8c42
commit 9c4afae
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.ci/clean-windows-deps.yml b/.ci/clean-windows-deps.yml
@@ -1,6 +1,10 @@
 steps:
   # Remove Rust:
   # https://github.com/actions/virtual-environments/blob/main/images/win/scripts/Installers/Install-Rust.ps1
+  - script: dir "C:\Program Files"
+    displayName: "List PF"
+  - script: dir "C:\Program Files (x86)"
+    displayName: "List PF x86"
   - script: rd /s /q "C:\Rust"
     displayName: 'Remove Rust'
   # Remove R
@@ -21,7 +25,7 @@ steps:
     displayName: "Remove TortoiseSVN"
   - script: rd /s /q "C:\Program Files\Internet Explorer"
     displayName: "Remove Internet Explorer"
-  - script: rd /s /q "C:\Program Files\Unity"
+  - script: rd /s /q "C:\Program Files\Unity Hub"
     displayName: "Remove Unity"
   - script: rd /s /q "C:\Program Files\Android"
     displayName: "Remove Android SDK"

diff --git a/CHANGES_CURRENT.md b/CHANGES_CURRENT.md
@@ -77,4 +77,4 @@
 
 - #3721 - Packaging - Linux: Bundle compiled glib settings (fixes #3706)
 - #3770 - Build: Fix `esy watch` command (thanks @eEQK !)
-- #3780 - Chore: Update windows codesigning certificate
+- #3780, #3786 - Chore: Update windows codesigning certificate
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -160,7 +160,7 @@ jobs:
   timeoutInMinutes: 180
   displayName: "Windows - Build & Package"
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
 
   variables:
     STAGING_DIRECTORY: $(Build.StagingDirectory)
@@ -193,7 +193,7 @@ jobs:
   # Run if not master
   condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master'))
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
 
   variables:
     STAGING_DIRECTORY: $(Build.StagingDirectory)

diff --git a/scripts/windows/publish.ps1 b/scripts/windows/publish.ps1
@@ -14,7 +14,7 @@ function CodeSign {
 
 
 
-    &"C:/Program Files (x86)/Windows Kits/8.1/bin/x64/signtool.exe" sign /tr http://timestamp.digicert.com /fd sha256 /td sha256 /f $env:CODESIGN_CERTIFICATE /p $env:CODESIGN_PASSWORD_WIN $path
+    &"C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x64/signtool.exe" sign /tr http://timestamp.digicert.com /fd sha256 /td sha256 /f $env:CODESIGN_CERTIFICATE /p $env:CODESIGN_PASSWORD_WIN $path
 
 }
 

diff --git a/scripts/windows/verify-signtool.ps1 b/scripts/windows/verify-signtool.ps1
@@ -1 +1 @@
-&"C:/Program Files (x86)/Windows Kits/8.1/bin/x64/signtool.exe" sign /?
+&"C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x64/signtool.exe" sign /?
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,7 +14,7 @@ function CodeSign {



		&"C:/Program Files (x86)/Windows Kits/8.1/bin/x64/signtool.exe" sign /tr http://timestamp.digicert.com /fd sha256 /td sha256 /f $env:CODESIGN_CERTIFICATE /p $env:CODESIGN_PASSWORD_WIN $path
		&"C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x64/signtool.exe" sign /tr http://timestamp.digicert.com /fd sha256 /td sha256 /f $env:CODESIGN_CERTIFICATE /p $env:CODESIGN_PASSWORD_WIN $path

		}

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		&"C:/Program Files (x86)/Windows Kits/8.1/bin/x64/signtool.exe" sign /?
		&"C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x64/signtool.exe" sign /?
Expand Down