From 4b3ed530e84a8aa78f2dd4e9d1654465adab4910 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 20 May 2021 22:35:47 +0000 Subject: [PATCH] Bug 1712036 - Cleanup remaining browser tooltool manifests. r=firefox-build-system-reviewers,mhentges Differential Revision: https://phabricator.services.mozilla.com/D115582 --- .../releng.manifest => vs2017-15.8.manifest} | 0 .../aarch64.manifest => vs2017-15.9.manifest} | 0 .../tooltool-manifests/win64/releng.manifest | 10 --- .../tooltool-manifests/win64/vs2017.manifest | 10 --- taskcluster/ci/build/windows.yml | 62 +++++++++---------- taskcluster/ci/instrumented-build/kind.yml | 4 +- taskcluster/ci/searchfox/kind.yml | 2 +- taskcluster/ci/spidermonkey/windows.yml | 8 +-- .../ci/static-analysis-autotest/kind.yml | 2 +- taskcluster/ci/toolchain/cbindgen.yml | 2 +- taskcluster/ci/toolchain/clang-tidy.yml | 2 +- taskcluster/ci/toolchain/clang.yml | 8 +-- taskcluster/ci/toolchain/dump-syms.yml | 2 +- taskcluster/ci/toolchain/fix-stacks.yml | 2 +- taskcluster/ci/toolchain/geckodriver.yml | 4 +- taskcluster/ci/toolchain/gn.yml | 2 +- taskcluster/ci/toolchain/grcov.yml | 2 +- taskcluster/ci/toolchain/misc.yml | 2 +- taskcluster/ci/toolchain/rust-size.yml | 2 +- taskcluster/ci/toolchain/sccache.yml | 2 +- taskcluster/ci/webrender/kind.yml | 2 +- .../32_stat_and_debug.py | 3 +- .../configs/single_locale/tc_win32.py | 2 +- .../configs/single_locale/tc_win64.py | 2 +- 24 files changed, 58 insertions(+), 79 deletions(-) rename browser/config/tooltool-manifests/{win32/releng.manifest => vs2017-15.8.manifest} (100%) rename browser/config/tooltool-manifests/{win64/aarch64.manifest => vs2017-15.9.manifest} (100%) delete mode 100644 browser/config/tooltool-manifests/win64/releng.manifest delete mode 100644 browser/config/tooltool-manifests/win64/vs2017.manifest diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/browser/config/tooltool-manifests/vs2017-15.8.manifest similarity index 100% rename from browser/config/tooltool-manifests/win32/releng.manifest rename to browser/config/tooltool-manifests/vs2017-15.8.manifest diff --git a/browser/config/tooltool-manifests/win64/aarch64.manifest b/browser/config/tooltool-manifests/vs2017-15.9.manifest similarity index 100% rename from browser/config/tooltool-manifests/win64/aarch64.manifest rename to browser/config/tooltool-manifests/vs2017-15.9.manifest diff --git a/browser/config/tooltool-manifests/win64/releng.manifest b/browser/config/tooltool-manifests/win64/releng.manifest deleted file mode 100644 index 5ec9a8377adf..000000000000 --- a/browser/config/tooltool-manifests/win64/releng.manifest +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "version": "Visual Studio 2017 15.8.4 / SDK 10.0.17134.0", - "digest": "ecf1e03f6f98f86775059a43f9e7dc7e326f6643d7c08962d9f614e4f5a65b1ca63fa1cfeb0f1a3c2474bf0d4318dda960b378beb2a44ecf8a91111207f4ece5", - "size": 349626009, - "algorithm": "sha512", - "filename": "vs2017_15.8.4.zip", - "unpack": true - } -] diff --git a/browser/config/tooltool-manifests/win64/vs2017.manifest b/browser/config/tooltool-manifests/win64/vs2017.manifest deleted file mode 100644 index 5ec9a8377adf..000000000000 --- a/browser/config/tooltool-manifests/win64/vs2017.manifest +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "version": "Visual Studio 2017 15.8.4 / SDK 10.0.17134.0", - "digest": "ecf1e03f6f98f86775059a43f9e7dc7e326f6643d7c08962d9f614e4f5a65b1ca63fa1cfeb0f1a3c2474bf0d4318dda960b378beb2a44ecf8a91111207f4ece5", - "size": 349626009, - "algorithm": "sha512", - "filename": "vs2017_15.8.4.zip", - "unpack": true - } -] diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml index 30261e2da544..ae77702de939 100644 --- a/taskcluster/ci/build/windows.yml +++ b/taskcluster/ci/build/windows.yml @@ -28,7 +28,7 @@ win32/debug: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: options: [append-env-variables-from-configs] @@ -81,7 +81,7 @@ win32/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: options: [append-env-variables-from-configs] @@ -134,7 +134,7 @@ win64/debug: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: options: [append-env-variables-from-configs] @@ -187,7 +187,7 @@ win64-fuzzing/debug: max-run-time: 7200 env: PERFHERDER_EXTRA_OPTIONS: fuzzing - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -239,7 +239,7 @@ win64-plain/debug: max-run-time: 7200 env: PERFHERDER_EXTRA_OPTIONS: plain - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [build] options: [append-env-variables-from-configs] @@ -281,7 +281,7 @@ win64/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: options: [append-env-variables-from-configs] @@ -335,7 +335,7 @@ win64-plain/opt: max-run-time: 7200 env: PERFHERDER_EXTRA_OPTIONS: plain - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [build] options: [append-env-variables-from-configs] @@ -393,7 +393,7 @@ win32-shippable/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 10800 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: actions: [get-secrets, build] @@ -449,7 +449,7 @@ win64-shippable/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 10800 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: actions: [get-secrets, build] @@ -497,7 +497,7 @@ win32-add-on-devel/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 10800 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -547,7 +547,7 @@ win64-add-on-devel/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 10800 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -597,7 +597,7 @@ win64-noopt/debug: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -647,7 +647,7 @@ win32-noopt/debug: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -697,7 +697,7 @@ win32-rusttests/opt: max-run-time: 5400 env: PERFHERDER_EXTRA_OPTIONS: rusttests - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -740,7 +740,7 @@ win32-rusttests/debug: max-run-time: 5400 env: PERFHERDER_EXTRA_OPTIONS: rusttests - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -783,7 +783,7 @@ win64-rusttests/opt: max-run-time: 5400 env: PERFHERDER_EXTRA_OPTIONS: rusttests - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -823,7 +823,7 @@ win64-rusttests/debug: max-run-time: 5400 env: PERFHERDER_EXTRA_OPTIONS: rusttests - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: actions: [get-secrets, build] options: [append-env-variables-from-configs] @@ -868,7 +868,7 @@ win64-ccov/opt: type: file max-run-time: 9000 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" RUSTC_BOOTSTRAP: '1' MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: @@ -909,7 +909,7 @@ win64-asan/debug: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" PERFHERDER_EXTRA_OPTIONS: "debug asan" run: actions: [get-secrets, build] @@ -962,7 +962,7 @@ win64-asan/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" PERFHERDER_EXTRA_OPTIONS: "opt asan" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: @@ -1020,7 +1020,7 @@ win64-asan-reporter-shippable/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" PERFHERDER_EXTRA_OPTIONS: "asan-reporter" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: @@ -1076,7 +1076,7 @@ win64-asan-fuzzing/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" PERFHERDER_EXTRA_OPTIONS: fuzzing-asan run: actions: [get-secrets, build] @@ -1146,7 +1146,7 @@ win32-devedition/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 10800 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: actions: [get-secrets, build] @@ -1203,7 +1203,7 @@ win64-devedition/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 10800 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: actions: [get-secrets, build] @@ -1255,7 +1255,7 @@ win64-aarch64/debug: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest" PERFHERDER_EXTRA_OPTIONS: aarch64 run: actions: [get-secrets, build] @@ -1314,7 +1314,7 @@ win64-aarch64/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest" PERFHERDER_EXTRA_OPTIONS: aarch64 MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: @@ -1367,7 +1367,7 @@ win64-aarch64-eme/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest" PERFHERDER_EXTRA_OPTIONS: aarch64-eme MOZ_ARTIFACT_TASK: {task-reference: ''} MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: ''} @@ -1419,7 +1419,7 @@ win64-aarch64-shippable/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest" PERFHERDER_EXTRA_OPTIONS: aarch64 MOZ_ARTIFACT_TASK: {task-reference: ''} MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: ''} @@ -1519,7 +1519,7 @@ win64-aarch64-shippable-no-eme/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest" PERFHERDER_EXTRA_OPTIONS: aarch64-no-eme MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: @@ -1580,7 +1580,7 @@ win64-aarch64-devedition/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest" MOZ_ARTIFACT_TASK: {task-reference: ''} MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: ''} USE_ARTIFACT: '1' @@ -1679,7 +1679,7 @@ win64-aarch64-devedition-no-eme/opt: docker-image: {in-tree: debian10-amd64-build} max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest" PERFHERDER_EXTRA_OPTIONS: aarch64-no-eme MOZ_AUTOMATION_PACKAGE_TESTS: "1" run: diff --git a/taskcluster/ci/instrumented-build/kind.yml b/taskcluster/ci/instrumented-build/kind.yml index 9110fa44c0b3..c0c41a3b8c84 100644 --- a/taskcluster/ci/instrumented-build/kind.yml +++ b/taskcluster/ci/instrumented-build/kind.yml @@ -189,7 +189,7 @@ jobs: worker: docker-image: {in-tree: debian10-amd64-build} env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: options: [append-env-variables-from-configs] mozconfig-variant: profile-generate @@ -232,7 +232,7 @@ jobs: worker: docker-image: {in-tree: debian10-amd64-build} env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: options: [append-env-variables-from-configs] mozconfig-variant: profile-generate diff --git a/taskcluster/ci/searchfox/kind.yml b/taskcluster/ci/searchfox/kind.yml index 3851709d08e8..e57643caed19 100644 --- a/taskcluster/ci/searchfox/kind.yml +++ b/taskcluster/ci/searchfox/kind.yml @@ -113,7 +113,7 @@ jobs: docker-image: {in-tree: debian10-amd64-build} max-run-time: 36000 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" PERFHERDER_EXTRA_OPTIONS: searchfox RUSTC_BOOTSTRAP: "1" MOZSEARCH_PLATFORM: "windows" diff --git a/taskcluster/ci/spidermonkey/windows.yml b/taskcluster/ci/spidermonkey/windows.yml index 7f6806944132..0b5fbe55dffb 100644 --- a/taskcluster/ci/spidermonkey/windows.yml +++ b/taskcluster/ci/spidermonkey/windows.yml @@ -7,7 +7,7 @@ job-defaults: worker: max-run-time: 36000 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: tooltool-downloads: internal @@ -44,7 +44,7 @@ sm-plain-win32/debug: - win64-rust worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" sm-plain-win64/opt: description: "Spidermonkey Plain win64 opt" @@ -79,7 +79,7 @@ sm-plain-win32/opt: - win64-rust worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" sm-compacting-win64/debug: description: "Spidermonkey Compacting win64 debug" @@ -114,4 +114,4 @@ sm-compacting-win32/debug: - win64-rust worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" diff --git a/taskcluster/ci/static-analysis-autotest/kind.yml b/taskcluster/ci/static-analysis-autotest/kind.yml index 4b18ed414ee8..d7e34ca30c10 100644 --- a/taskcluster/ci/static-analysis-autotest/kind.yml +++ b/taskcluster/ci/static-analysis-autotest/kind.yml @@ -79,7 +79,7 @@ jobs: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: config: - builds/releng_base_firefox.py diff --git a/taskcluster/ci/toolchain/cbindgen.yml b/taskcluster/ci/toolchain/cbindgen.yml index ff338efa0283..350eb3307b09 100644 --- a/taskcluster/ci/toolchain/cbindgen.yml +++ b/taskcluster/ci/toolchain/cbindgen.yml @@ -64,7 +64,7 @@ win64-cbindgen: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: arguments: ['x86_64-pc-windows-msvc'] resources: diff --git a/taskcluster/ci/toolchain/clang-tidy.yml b/taskcluster/ci/toolchain/clang-tidy.yml index 41f0cac18b33..a72f12a28cc7 100644 --- a/taskcluster/ci/toolchain/clang-tidy.yml +++ b/taskcluster/ci/toolchain/clang-tidy.yml @@ -102,7 +102,7 @@ win64-clang-tidy: worker: max-run-time: 7200 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: script: build-clang.sh arguments: diff --git a/taskcluster/ci/toolchain/clang.yml b/taskcluster/ci/toolchain/clang.yml index c5582ce4b51d..8f5ceebb8f24 100644 --- a/taskcluster/ci/toolchain/clang.yml +++ b/taskcluster/ci/toolchain/clang.yml @@ -321,7 +321,7 @@ win64-clang-11: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" max-run-time: 9000 run-on-projects: - trunk @@ -347,7 +347,7 @@ win64-clang-11-2stage: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: script: build-clang.sh arguments: @@ -545,7 +545,7 @@ win64-clang-12: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" max-run-time: 9000 run-on-projects: - trunk @@ -572,7 +572,7 @@ win64-clang-12-2stage: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: script: build-clang.sh arguments: diff --git a/taskcluster/ci/toolchain/dump-syms.yml b/taskcluster/ci/toolchain/dump-syms.yml index 4357d1eac843..c41df2f499af 100644 --- a/taskcluster/ci/toolchain/dump-syms.yml +++ b/taskcluster/ci/toolchain/dump-syms.yml @@ -64,7 +64,7 @@ win64-dump-syms: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: toolchain-artifact: public/build/dump_syms.tar.bz2 resources: diff --git a/taskcluster/ci/toolchain/fix-stacks.yml b/taskcluster/ci/toolchain/fix-stacks.yml index 4eefc24d8861..f58b7cf91505 100644 --- a/taskcluster/ci/toolchain/fix-stacks.yml +++ b/taskcluster/ci/toolchain/fix-stacks.yml @@ -61,7 +61,7 @@ win32-fix-stacks: symbol: TW32(fix-stacks) worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: arguments: ['i686-pc-windows-msvc'] toolchain-artifact: public/build/fix-stacks.tar.bz2 diff --git a/taskcluster/ci/toolchain/geckodriver.yml b/taskcluster/ci/toolchain/geckodriver.yml index b1ae49c7941b..0b781849b5cd 100644 --- a/taskcluster/ci/toolchain/geckodriver.yml +++ b/taskcluster/ci/toolchain/geckodriver.yml @@ -88,7 +88,7 @@ win32-geckodriver: platform: win32/opt worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: arguments: ['i686-pc-windows-msvc'] resources: @@ -109,7 +109,7 @@ win64-geckodriver: platform: win64/opt worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: arguments: ['x86_64-pc-windows-msvc'] resources: diff --git a/taskcluster/ci/toolchain/gn.yml b/taskcluster/ci/toolchain/gn.yml index 291411826a14..728697490e6c 100644 --- a/taskcluster/ci/toolchain/gn.yml +++ b/taskcluster/ci/toolchain/gn.yml @@ -44,7 +44,7 @@ win32-gn: worker: max-run-time: 3600 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: script: build-gn-win32.sh resources: diff --git a/taskcluster/ci/toolchain/grcov.yml b/taskcluster/ci/toolchain/grcov.yml index b533300ba8cb..b97bcdc2b1ae 100644 --- a/taskcluster/ci/toolchain/grcov.yml +++ b/taskcluster/ci/toolchain/grcov.yml @@ -40,7 +40,7 @@ win64-grcov: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: toolchain-artifact: public/build/grcov.tar.bz2 resources: diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml index 4124bdfcf52d..aad8a35aa8d4 100644 --- a/taskcluster/ci/toolchain/misc.yml +++ b/taskcluster/ci/toolchain/misc.yml @@ -318,7 +318,7 @@ win64-winchecksec: symbol: TW64(winchecksec) worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: script: build-winchecksec.sh toolchain-artifact: public/build/winchecksec.tar.bz2 diff --git a/taskcluster/ci/toolchain/rust-size.yml b/taskcluster/ci/toolchain/rust-size.yml index feae43285606..26612f877ffd 100644 --- a/taskcluster/ci/toolchain/rust-size.yml +++ b/taskcluster/ci/toolchain/rust-size.yml @@ -28,7 +28,7 @@ win64-rust-size: worker-type: b-win2012 worker: env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: toolchain-artifact: public/build/rust-size.tar.bz2 resources: diff --git a/taskcluster/ci/toolchain/sccache.yml b/taskcluster/ci/toolchain/sccache.yml index 2f79043faaba..3af3c274ef24 100644 --- a/taskcluster/ci/toolchain/sccache.yml +++ b/taskcluster/ci/toolchain/sccache.yml @@ -72,7 +72,7 @@ win64-sccache: worker: max-run-time: 3600 env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest" + TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.8.manifest" run: toolchain-artifact: public/build/sccache.tar.bz2 resources: diff --git a/taskcluster/ci/webrender/kind.yml b/taskcluster/ci/webrender/kind.yml index a557b407d004..179e58f9dba8 100644 --- a/taskcluster/ci/webrender/kind.yml +++ b/taskcluster/ci/webrender/kind.yml @@ -221,7 +221,7 @@ jobs: worker: max-run-time: 5400 env: - TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/win64/vs2017.manifest' + TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/vs2017-15.8.manifest' fetches: toolchain: - win64-rust diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py index 8a385cf7b68c..edd50ae8f392 100644 --- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py +++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py @@ -12,8 +12,7 @@ config = { ], "stage_platform": "win32-st-an-debug", "debug_build": True, - "tooltool_manifest_src": "browser/config/tooltool-manifests/win32/\ -releng.manifest", + "tooltool_manifest_src": "browser/config/tooltool-manifests/vs2017-15.8.manifest", #### 32 bit build specific ##### "env": { "HG_SHARE_BASE_DIR": "C:/builds/hg-shared", diff --git a/testing/mozharness/configs/single_locale/tc_win32.py b/testing/mozharness/configs/single_locale/tc_win32.py index 26fa8d91355a..88d218571483 100644 --- a/testing/mozharness/configs/single_locale/tc_win32.py +++ b/testing/mozharness/configs/single_locale/tc_win32.py @@ -15,5 +15,5 @@ config = { "TOOLTOOL_CACHE": os.environ.get("TOOLTOOL_CACHE"), "EN_US_PACKAGE_NAME": "target.zip", }, - "tooltool_manifest_src": "browser/config/tooltool-manifests/win32/releng.manifest", + "tooltool_manifest_src": "browser/config/tooltool-manifests/vs2017-15.8.manifest", } diff --git a/testing/mozharness/configs/single_locale/tc_win64.py b/testing/mozharness/configs/single_locale/tc_win64.py index c172ac5f413a..88d218571483 100644 --- a/testing/mozharness/configs/single_locale/tc_win64.py +++ b/testing/mozharness/configs/single_locale/tc_win64.py @@ -15,5 +15,5 @@ config = { "TOOLTOOL_CACHE": os.environ.get("TOOLTOOL_CACHE"), "EN_US_PACKAGE_NAME": "target.zip", }, - "tooltool_manifest_src": "browser/config/tooltool-manifests/win64/releng.manifest", + "tooltool_manifest_src": "browser/config/tooltool-manifests/vs2017-15.8.manifest", }