diff --git a/.gitattributes b/.gitattributes index 622b6f29d..83a478f83 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ *.patch linguist-language=C++ -.github/workflows/object/*.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index d347e6bd0..0c657d9ef 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -317,23 +317,16 @@ jobs: with: submodules: recursive token: ${{ secrets.DEPLOY_KEY }} - lfs: true - name: Git Pull run: | git pull - git lfs pull - uses: actions/download-artifact@v4 - name: List run: find . - - name: Unpack windows build (.tar.gz) - run: | - tar -xvf .github/workflows/object/windows-x64-signed-generic.tar.gz -C . - tar -xvf .github/workflows/object/windows-x64-signed-specific.tar.gz -C . - - name: Clone updates repo uses: actions/checkout@v4 with: @@ -348,8 +341,8 @@ jobs: cp -a ../linux_update_manifest_generic/. updates/ cp -a ../linux_update_manifest_specific/. updates/ - cp -a ../windows-x64-signed-generic/update_manifest/. updates/ - cp -a ../windows-x64-signed-specific/update_manifest/. updates/ + cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/ + cp -a ../.github/workflows/object/windows-x64-signed-specific/update_manifest/. updates/ cp -a ../macos_update_manifest_aarch64/. updates/ cp -a ../macos_update_manifest_x64/. updates/ @@ -376,16 +369,16 @@ jobs: zen-generic.AppImage.zsync zen-specific.AppImage zen-specific.AppImage.zsync - windows-x64-signed-generic/zen.win-generic.zip - windows-x64-signed-specific/zen.win-specific.zip + .github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip + .github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip linux.mar linux-generic.mar - windows-x64-signed-generic/windows-generic.mar - windows-x64-signed-specific/windows.mar + .github/workflows/object/windows-x64-signed-generic/windows-generic.mar + .github/workflows/object/windows-x64-signed-specific/windows.mar macos-x64.mar macos-aarch64.mar - windows-x64-signed-specific/zen.installer.exe - windows-x64-signed-generic/zen.installer-generic.exe + .github/workflows/object/windows-x64-signed-specific/zen.installer.exe + .github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe zen.macos-x64.dmg zen.macos-aarch64.dmg diff --git a/.github/workflows/object/windows-x64-signed-generic.tar.gz b/.github/workflows/object/windows-x64-signed-generic.tar.gz deleted file mode 100644 index 9c1bdbfb6..000000000 --- a/.github/workflows/object/windows-x64-signed-generic.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6eae13d446c4326d555f9470e7773b367e7d9e2f3ef2b051a8fbd64bf7ebffaf -size 237737135 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 new file mode 100644 index 000000000..d890259d5 --- /dev/null +++ b/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml @@ -0,0 +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 new file mode 100644 index 000000000..d890259d5 --- /dev/null +++ b/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml @@ -0,0 +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 new file mode 100644 index 000000000..72812f982 Binary files /dev/null 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 new file mode 100644 index 000000000..4d5a61bee Binary files /dev/null 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 new file mode 100644 index 000000000..064c95bb9 Binary files /dev/null and b/.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip differ diff --git a/.github/workflows/object/windows-x64-signed-specific.tar.gz b/.github/workflows/object/windows-x64-signed-specific.tar.gz deleted file mode 100644 index 622713ffa..000000000 --- a/.github/workflows/object/windows-x64-signed-specific.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:474d09353b1ef5e8f16d4785d8084b264630a7a8072a6cd4532904f923fff7ba -size 237641008 diff --git a/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml new file mode 100644 index 000000000..ceb921d56 --- /dev/null +++ b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml @@ -0,0 +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-generic/update.xml b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml new file mode 100644 index 000000000..ceb921d56 --- /dev/null +++ b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml @@ -0,0 +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 new file mode 100644 index 000000000..54838a326 Binary files /dev/null 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 new file mode 100644 index 000000000..ea3d63aa1 Binary files /dev/null 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 new file mode 100644 index 000000000..f39a79285 Binary files /dev/null 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 5a4207fc6..866db5527 100644 --- a/build/winsign/sign.ps1 +++ b/build/winsign/sign.ps1 @@ -34,8 +34,11 @@ function SignAndPackage($name) { $env:MAR="$PWD\\build\\winsign\\mar.exe" if ($name -eq "generic") { $env:SURFER_COMPAT="true" + } else { + rm env:SURFER_COMPAT -ErrorAction SilentlyContinue } + echo "Compat Mode? $env:SURFER_COMPAT" pnpm surfer package --verbose # In the release script, we do the following: @@ -67,14 +70,22 @@ function SignAndPackage($name) { # Move the zip mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip + # Extract the zip, sign everything inside, and repackage it + Expand-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name.zip -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$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 sha1 /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 + # Move the manifest - foreach ($file in Get-ChildItem .\dist\update\) { - mv ".\\dist\\update\\$file" windsign-temp\windows-x64-signed-$name\update_manifest - } + mv .\dist\update\. windsign-temp\windows-x64-signed-$name\update_manifest echo "Invoking tar for $name" # note: We need to sign it into a parent folder, called windows-x64-signed-$name - tar -czvf .\.github\workflows\object\windows-x64-signed-$name.tar.gz -C .\windsign-temp\ windows-x64-signed-$name + rmdir .\.github\workflows\object\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue + mv .\windsign-temp\windows-x64-signed-$name .\.github\workflows\object\windows-x64-signed-$name -Force echo "Finished $name" } diff --git a/package.json b/package.json index 12d94f376..8cf568030 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "homepage": "https://github.com/zen-browser/core#readme", "dependencies": { - "@zen-browser/surfer": "^1.4.18" + "@zen-browser/surfer": "^1.4.20" }, "devDependencies": { "husky": "^9.1.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 106683d80..001eb000b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@zen-browser/surfer': - specifier: ^1.4.18 - version: 1.4.18 + specifier: ^1.4.20 + version: 1.4.20 devDependencies: husky: specifier: ^9.1.5 @@ -119,8 +119,8 @@ packages: '@types/node@17.0.45': resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@zen-browser/surfer@1.4.18': - resolution: {integrity: sha512-NFqF5amqa4TuGFk+uVQNY4FngIvyhXvtZdpHUbU8Oeq3nfKE+bsLUHbFz8j9I5sFLQkuHmCsfTtR5gKA5el4YA==} + '@zen-browser/surfer@1.4.20': + resolution: {integrity: sha512-M9+Jax/B+UQsebJ0K3BaNEKUi/EelKufvG2frWQ4uVAQF9LzFwyyliS5wbcUTs3Ufit4b8xQK7ddt02DmK/Lng==} hasBin: true ansi-escapes@7.0.0: @@ -1003,7 +1003,7 @@ snapshots: '@types/node@17.0.45': {} - '@zen-browser/surfer@1.4.18': + '@zen-browser/surfer@1.4.20': dependencies: '@resvg/resvg-js': 1.4.0 async-icns: 1.0.2