eliott/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop synced 2026-04-25 17:15:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

no-bug: Update rust deps and VS version (gh-12850)

Browse Source
This commit is contained in:
mr. m
2026-03-20 14:07:14 +01:00
committed by GitHub
parent 6703a31001
commit cb7fbe43ee
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ jobs:
tar --zstd -xf wine.tar.zst -C ~/win-cross tar --zstd -xf wine.tar.zst -C ~/win-cross
rm wine.tar.zst rm wine.tar.zst
echo Setup Visual Studio echo Setup Visual Studio
./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022 ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2026.yaml ~/win-cross/vs2026
- name: Import - name: Import
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }} if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
@@ -174,7 +174,7 @@ jobs:
run: | run: |
set -x set -x
cd engine/ cd engine/
chmod -R +x "$(echo ~)/win-cross/vs2022" || true chmod -R +x "$(echo ~)/win-cross/vs2026" || true
cd .. cd ..
export SURFER_PLATFORM="win32" export SURFER_PLATFORM="win32"
npm run bootstrap npm run bootstrap
@@ -185,7 +185,7 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install dos2unix sudo apt-get install dos2unix
ls ~/win-cross/wine || true ls ~/win-cross/wine || true
ls ~/win-cross/vs2022 || true ls ~/win-cross/vs2026 || true
- name: Setup Rust - name: Setup Rust
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }} if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}

2
.rust-toolchain
View File

@@ -1 +1 @@
1.89 1.95

2
build/windows/bootstrap.ps1
View File

@@ -9,5 +9,5 @@ rustup target add aarch64-pc-windows-msvc
rustup target add x86_64-pc-windows-msvc rustup target add x86_64-pc-windows-msvc
cd engine cd engine
./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ../win-cross/vs2022 ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2026.yaml ../win-cross/vs2026
cd .. cd ..

4
build/windows/sign.ps1
View File

@@ -142,9 +142,9 @@ function SignAndPackage($name) {
$env:ZEN_SETUP_EXE_PATH="$PWD\windsign-temp\windows-x64-obj-$name\browser\installer\windows\instgen\setup.exe" $env:ZEN_SETUP_EXE_PATH="$PWD\windsign-temp\windows-x64-obj-$name\browser\installer\windows\instgen\setup.exe"
if ($name -eq "arm64") { if ($name -eq "arm64") {
$env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\arm64\Microsoft.VC143.CRT" $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2026\VC\Redist\MSVC\14.38.33135\arm64\Microsoft.VC143.CRT"
} else { } else {
$env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT" $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2026\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT"
} }
$env:MAR="..\\build\\windows\\mar.exe" $env:MAR="..\\build\\windows\\mar.exe"

6
configs/windows/mozconfig
View File

@@ -4,7 +4,7 @@
if test "$ZEN_CROSS_COMPILING"; then if test "$ZEN_CROSS_COMPILING"; then
export WINSYSROOT="$(echo ~)/win-cross/vs2022" export WINSYSROOT="$(echo ~)/win-cross/vs2026"
export WINE="$(echo ~)/win-cross/wine/bin/wine" export WINE="$(echo ~)/win-cross/wine/bin/wine"
export WINEDEBUG=-all export WINEDEBUG=-all
@@ -16,9 +16,9 @@ if test "$ZEN_CROSS_COMPILING"; then
CROSS_COMPILE=1 CROSS_COMPILE=1
if test "$SURFER_COMPAT" = "aarch64"; then if test "$SURFER_COMPAT" = "aarch64"; then
export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.38.33135/arm64/Microsoft.VC143.CRT" export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.38.33135/arm64/Microsoft.VC143.CRT"
else else
export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT" export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT"
fi fi
fi fi