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 d43290576..e4074ef8e 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 d43290576..e4074ef8e 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 6cbd57681..0ce3a1296 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 ddf8908c9..2ff1001ca 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 058562bf7..8fa9dab25 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 2204e5eb9..05e750a9c 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 2204e5eb9..05e750a9c 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 2ba652b44..0f826a868 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 d4cf7cb73..995aadb58 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 6b2516a22..83fecfe7c 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/build/winsign/sign.ps1 b/build/winsign/sign.ps1 index 850d7ea94..bbd069f89 100644 --- a/build/winsign/sign.ps1 +++ b/build/winsign/sign.ps1 @@ -10,8 +10,10 @@ git pull --recurse-submodules mkdir windsign-temp -ErrorAction SilentlyContinue # 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 +gh run download $GithubRunId --name windows-x64-obj-specific -D windsign-temp\windows-x64-obj-specific +echo "Downloaded specific artifacts" +gh run download $GithubRunId --name windows-x64-obj-generic -D windsign-temp\windows-x64-obj-generic +echo "Downloaded generic artifacts" mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue mkdir .\.github\workflows\object\ -ErrorAction SilentlyContinue @@ -29,7 +31,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 /ph + signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files echo "Packaging $name" $env:SURFER_SIGNING_MODE="sign" $env:MAR="$PWD\\build\\winsign\\mar.exe" @@ -76,7 +78,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 /ph + signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files 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