mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-01-07 05:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

Browse Source
This commit is contained in:
mr. M
2024-10-15 08:31:28 +02:00
parent 7023e0a800 3ca94633cd
commit 01d6fdf080
13 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml vendored
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<updates>
<update type="minor" displayVersion="1.0.1-a.8" appVersion="1.0.1-a.8" platformVersion="131.0.2" buildID="20241010195111">
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.8/windows-generic.mar" hashFunction="sha512" hashValue="0c6425c27ee62dd4bcf5fb8bc2bd6458c1dd3f1c3e1dce1b0c1b5325236b5110b2e74aaa7a33a85dbbf372ad6d5b49acbe8dbe6fca42fa26fcdf8e1bb408c82a" size="72536504"/>
<update type="minor" displayVersion="1.0.1-a.9" appVersion="1.0.1-a.9" platformVersion="131.0.3" buildID="20241014215847">
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.9/windows-generic.mar" hashFunction="sha512" hashValue="84772b8f520691027f48ff63f12abe9305a15b447513f16a7cdebaf5e0a3bdf5541ebea012328abea065a1104e2f60176ca3da7d503f293ab784dd1cfd7e65ce" size="72552508"/>
</update>
</updates>

4
.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml vendored
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<updates>
<update type="minor" displayVersion="1.0.1-a.8" appVersion="1.0.1-a.8" platformVersion="131.0.2" buildID="20241010195111">
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.8/windows-generic.mar" hashFunction="sha512" hashValue="0c6425c27ee62dd4bcf5fb8bc2bd6458c1dd3f1c3e1dce1b0c1b5325236b5110b2e74aaa7a33a85dbbf372ad6d5b49acbe8dbe6fca42fa26fcdf8e1bb408c82a" size="72536504"/>
<update type="minor" displayVersion="1.0.1-a.9" appVersion="1.0.1-a.9" platformVersion="131.0.3" buildID="20241014215847">
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.9/windows-generic.mar" hashFunction="sha512" hashValue="84772b8f520691027f48ff63f12abe9305a15b447513f16a7cdebaf5e0a3bdf5541ebea012328abea065a1104e2f60176ca3da7d503f293ab784dd1cfd7e65ce" size="72552508"/>
</update>
</updates>

BIN
.github/workflows/object/windows-x64-signed-generic/windows-generic.mar vendored
View File

Binary file not shown.

BIN
.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe vendored
View File

Binary file not shown.

BIN
.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip vendored
View File

Binary file not shown.

4
.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha/update.xml vendored
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<updates>
<update type="minor" displayVersion="1.0.1-a.8" appVersion="1.0.1-a.8" platformVersion="131.0.2" buildID="20241010195115">
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.8/windows.mar" hashFunction="sha512" hashValue="da508203d0c6cca9d85b12740a6985891c345ebd5221370d90043324bf42021248e3551bf4e3ce38a1d84ef1003fa5afb4edf2a1a54eab483cf3536c8d23c499" size="72505884"/>
<update type="minor" displayVersion="1.0.1-a.9" appVersion="1.0.1-a.9" platformVersion="131.0.3" buildID="20241014215847">
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.9/windows.mar" hashFunction="sha512" hashValue="77d63286a10a28dd85db864d264ee30abb49cd9797252da4bfb7494165551ac8b0acff2b63af70b2c418f12613829eeca8175d5d2925d26e4e2ff6cc93d79f1e" size="72559552"/>
</update>
</updates>

4
.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha/update.xml vendored
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<updates>
<update type="minor" displayVersion="1.0.1-a.8" appVersion="1.0.1-a.8" platformVersion="131.0.2" buildID="20241010195115">
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.8/windows.mar" hashFunction="sha512" hashValue="da508203d0c6cca9d85b12740a6985891c345ebd5221370d90043324bf42021248e3551bf4e3ce38a1d84ef1003fa5afb4edf2a1a54eab483cf3536c8d23c499" size="72505884"/>
<update type="minor" displayVersion="1.0.1-a.9" appVersion="1.0.1-a.9" platformVersion="131.0.3" buildID="20241014215847">
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.9/windows.mar" hashFunction="sha512" hashValue="77d63286a10a28dd85db864d264ee30abb49cd9797252da4bfb7494165551ac8b0acff2b63af70b2c418f12613829eeca8175d5d2925d26e4e2ff6cc93d79f1e" size="72559552"/>
</update>
</updates>

BIN
.github/workflows/object/windows-x64-signed-specific/windows.mar vendored
View File

Binary file not shown.

BIN
.github/workflows/object/windows-x64-signed-specific/zen.installer.exe vendored
View File

Binary file not shown.

BIN
.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip vendored
View File

Binary file not shown.

3
.github/workflows/windows-release-build.yml vendored
View File

@@ -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 }}

16
build/winsign/sign.ps1
View File

@@ -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

4
surfer.json
View File

@@ -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"
},