From c35494cbcf84e24b3d556c6230795f88ffccac9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mauro=20Balad=C3=A9s?= Date: Sat, 14 Sep 2024 17:57:52 -0700 Subject: [PATCH] Refactor sign.ps1 to update signing process and package specific build --- build/winsign/sign.ps1 | 5 +++-- configs/windows/mozconfig | 1 + package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1 index 7b39b5f0a..f62ee0285 100644 --- a/build/winsign/sign.ps1 +++ b/build/winsign/sign.ps1 @@ -14,7 +14,7 @@ pnpm surfer ci --brand alpha echo "Downloading from runner with ID $RunID" gh run download $RunID --name "windows-x64-obj-specific" --dir windsign-temp\windows-x64-obj-specific -#gh run download $RunID --name "windows-x64-obj-generic" --dir windsign-temp\windows-x64-obj-generic +gh run download $RunID --name "windows-x64-obj-generic" --dir windsign-temp\windows-x64-obj-generic function SignAndPackage($name) { echo "Executing on $name" @@ -26,11 +26,12 @@ function SignAndPackage($name) { $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" pnpm surfer package } SignAndPackage specific -#SignAndPackage generic +SignAndPackage generic # Cleaning up diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index 3101401b0..b456d9d3d 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -27,6 +27,7 @@ fi #? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793 #? https://phabricator.services.mozilla.com/D170170 ac_add_options --target=x86_64-pc-windows-msvc +ac_add_options --host=x86_64-pc-windows-msvc ac_add_options --disable-maintenance-service ac_add_options --disable-bits-download diff --git a/package.json b/package.json index 51952f46a..f306472d3 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.1" + "@zen-browser/surfer": "^1.4.8" }, "devDependencies": { "husky": "^9.1.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 248f11651..2d007a8f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@zen-browser/surfer': - specifier: ^1.4.1 - version: 1.4.1 + specifier: ^1.4.8 + version: 1.4.8 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.1': - resolution: {integrity: sha512-jinY6oHX3k72ZtbVn1TTH/+lbZn/Wfmh3I7MLXhQNPbUmVUdT3UgONwYcXV6xF7u2NqStb6M2E8ylFlXVGBxdw==} + '@zen-browser/surfer@1.4.8': + resolution: {integrity: sha512-bZTKP9QZaOi4UM6833dsDO+uqyEhtJr0YvDmPQ3Db2UsrHeaZHVRNh3GlLEiNNIHjQ55BswYUt0iPtjonfeRlg==} hasBin: true ansi-escapes@7.0.0: @@ -1003,7 +1003,7 @@ snapshots: '@types/node@17.0.45': {} - '@zen-browser/surfer@1.4.1': + '@zen-browser/surfer@1.4.8': dependencies: '@resvg/resvg-js': 1.4.0 async-icns: 1.0.2