Merge mozilla-central to autoland

This commit is contained in:
Stanca Serban 2024-02-29 02:21:34 +02:00
commit bb4e9a634d
3 changed files with 6 additions and 6 deletions

View file

@ -524,6 +524,9 @@ win64-vs2019:
resources:
- build/vs/vs2019.yaml
toolchain-artifact: project/gecko/vs/vs.tar.zst
toolchain-alias:
- vs
- vs-toolchain
win64-vs2022:
description: "VS 2022"
@ -541,9 +544,6 @@ win64-vs2022:
resources:
- build/vs/vs2022.yaml
toolchain-artifact: project/gecko/vs/vs.tar.zst
toolchain-alias:
- vs
- vs-toolchain
linux64-afl-instrumentation-4.0:
description: "AFL++ instrumentation toolchain build"

View file

@ -237,7 +237,7 @@ jobs:
symbol: WR(wrench)
when:
files-changed:
- 'build/win64/mozconfig.vs2022'
- 'build/win64/mozconfig.vs2019'
- 'gfx/wr/**'
- 'taskcluster/scripts/misc/wrench-windows-tests.sh'

View file

@ -130,9 +130,9 @@ case "$target" in
ln -s "windows kits/10" $MOZ_FETCHES_DIR/vs/sdk
EXTRA_CMAKE_FLAGS="
$EXTRA_CMAKE_FLAGS
-DMSVC_BASE=$MOZ_FETCHES_DIR/vs/vc/tools/msvc/14.39.33519
-DMSVC_BASE=$MOZ_FETCHES_DIR/vs/vc/tools/msvc/14.29.30133
-DWINSDK_BASE=$MOZ_FETCHES_DIR/vs/sdk
-DWINSDK_VER=10.0.22621.0
-DWINSDK_VER=10.0.19041.0
"
fi
;;