diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 2e93de621..f50ec2c8f 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -317,9 +317,12 @@ jobs: with: submodules: recursive token: ${{ secrets.DEPLOY_KEY }} + lfs: true - name: Git Pull - run: git pull + run: | + git pull + git lfs pull - uses: actions/download-artifact@v4 diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1 index 10341c9cf..b80b6df55 100644 --- a/build/winsign/sign.ps1 +++ b/build/winsign/sign.ps1 @@ -13,24 +13,30 @@ echo " - $pwd\windsign-temp\windows-x64-obj-specific" echo " - $pwd\windsign-temp\windows-x64-obj-generic" Read-Host "Press Enter to continue when ready" mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue +mkdir .\.github\workflows\object\ -ErrorAction SilentlyContinue pnpm surfer ci --brand alpha function SignAndPackage($name) { echo "Executing on $name" + rmdir .\dist -Recurse -ErrorAction SilentlyContinue rmdir engine\obj-x86_64-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue cp windsign-temp\windows-x64-obj-$name engine\obj-x86_64-pc-windows-msvc\ -Recurse echo "Signing $name" + # Collect all .exe and .dll files into a list $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 sha1 /v $files echo "Packaging $name" $env:SURFER_SIGNING_MODE="sign" $env:MAR="$PWD\\build\\winsign\\mar.exe" + if ($name -eq "generic") { + $env:SURFER_COMPAT="true" + } - rm .\dist -Recurse -ErrorAction SilentlyContinue - pnpm surfer package + pnpm surfer package --verbose # In the release script, we do the following: # tar -xvf .github/workflows/object/windows-x64-signed-generic.tar.gz -C windows-x64-signed-generic @@ -59,11 +65,17 @@ function SignAndPackage($name) { } # Move the zip - mv .\dist\zen.win64.zip windsign-temp\windows-x64-signed-$name\zen.win-$name.zip + mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip # Move the manifest - mv .\dist\update\* windsign-temp\windows-x64-signed-$name\ + foreach ($file in Get-ChildItem .\dist\update\) { + mv ".\\dist\\update\\$file" windsign-temp\windows-x64-signed-$name\update_manifest + } + + echo "Invoking tar for $name" tar -cvf .\.github\workflows\object\windows-x64-signed-$name.tar -C .\windsign-temp\windows-x64-signed-$name . + + echo "Finished $name" } SignAndPackage specific diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 329b197bd..b9c35455a 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 329b197bda1a40e3f0fe9a7d69b6ec3798e63bed +Subproject commit b9c35455ad1a299cdb9202dba15c8e1dc3780191