diff --git a/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml b/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml
index 32bb411b4..d43290576 100644
--- a/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml
+++ b/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml b/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml
index 32bb411b4..d43290576 100644
--- a/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml
+++ b/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/.github/workflows/object/windows-x64-signed-generic/windows-generic.mar b/.github/workflows/object/windows-x64-signed-generic/windows-generic.mar
index 0a83bbb30..6cbd57681 100644
Binary files a/.github/workflows/object/windows-x64-signed-generic/windows-generic.mar and b/.github/workflows/object/windows-x64-signed-generic/windows-generic.mar differ
diff --git a/.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe b/.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
index f569c8327..ddf8908c9 100644
Binary files a/.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe and b/.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe differ
diff --git a/.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip b/.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
index e9413dba4..058562bf7 100644
Binary files a/.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip and b/.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip differ
diff --git a/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha/update.xml b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha/update.xml
index cee88bc8f..2204e5eb9 100644
--- a/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha/update.xml
+++ b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha/update.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha/update.xml b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha/update.xml
index cee88bc8f..2204e5eb9 100644
--- a/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha/update.xml
+++ b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha/update.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/.github/workflows/object/windows-x64-signed-specific/windows.mar b/.github/workflows/object/windows-x64-signed-specific/windows.mar
index b81eeeebb..2ba652b44 100644
Binary files a/.github/workflows/object/windows-x64-signed-specific/windows.mar and b/.github/workflows/object/windows-x64-signed-specific/windows.mar differ
diff --git a/.github/workflows/object/windows-x64-signed-specific/zen.installer.exe b/.github/workflows/object/windows-x64-signed-specific/zen.installer.exe
index ecd7ef682..d4cf7cb73 100644
Binary files a/.github/workflows/object/windows-x64-signed-specific/zen.installer.exe and b/.github/workflows/object/windows-x64-signed-specific/zen.installer.exe differ
diff --git a/.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip b/.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
index f0dffbbb9..6b2516a22 100644
Binary files a/.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip and b/.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip differ
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index a05a73674..fa52b2723 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -212,7 +212,8 @@ jobs:
if: ${{ !inputs.generate-gpo }}
run: |
set -x
- find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} +
+ find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \;
+ find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
- name: Upload dist object
if: ${{ !inputs.generate-gpo }}
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
index 59ea6cb11..850d7ea94 100644
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -1,5 +1,6 @@
param(
- [string][Parameter(Mandatory=$true)]$SignIdentity
+ [string][Parameter(Mandatory=$true)]$SignIdentity,
+ [string][Parameter(Mandatory=$true)]$GithubRunId
)
$ErrorActionPreference = "Stop"
@@ -8,11 +9,10 @@ echo "Preparing environment"
git pull --recurse-submodules
mkdir windsign-temp -ErrorAction SilentlyContinue
-echo "Please UNZIP the generic and specific artifacts into windsign-temp"
-echo "With the following filenames:"
-echo " - $pwd\windsign-temp\windows-x64-obj-specific"
-echo " - $pwd\windsign-temp\windows-x64-obj-generic"
-Read-Host "Press Enter to continue when ready"
+# Download in parallel
+gh run download $GithubRunId --name windows-x64-obj-specific -p windsign-temp\windows-x64-obj-specific
+gh run download $GithubRunId --name windows-x64-obj-generic -p windsign-temp\windows-x64-obj-generic
+
mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
mkdir .\.github\workflows\object\ -ErrorAction SilentlyContinue
@@ -29,7 +29,7 @@ function SignAndPackage($name) {
$files = Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Include *.exe
$files += Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Include *.dll
- signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
+ signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files /ph
echo "Packaging $name"
$env:SURFER_SIGNING_MODE="sign"
$env:MAR="$PWD\\build\\winsign\\mar.exe"
@@ -76,7 +76,7 @@ function SignAndPackage($name) {
rm windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
$files = Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.exe
$files += Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.dll
- signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
+ signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files /ph
Compress-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
rmdir windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -ErrorAction SilentlyContinue
diff --git a/surfer.json b/surfer.json
index 05c35b642..a20c82514 100644
--- a/surfer.json
+++ b/surfer.json
@@ -18,7 +18,7 @@
"brandShortName": "Zen Browser",
"brandFullName": "Zen Browser",
"release": {
- "displayVersion": "1.0.1-a.8",
+ "displayVersion": "1.0.1-a.9",
"github": {
"repo": "zen-browser/desktop"
},
@@ -38,7 +38,7 @@
"brandShortName": "Zen Twilight",
"brandFullName": "Zen Twilight",
"release": {
- "displayVersion": "1.0.1-a.8",
+ "displayVersion": "1.0.1-a.9",
"github": {
"repo": "zen-browser/desktop"
},