Bug 1389398 - Remove remaining clang entries in windows tooltool manifests. r?gps
Since the buildbot-based Windows builds using releng.manifest are busted
anyways, there is no reason to keep clang entries in there. Which makes
those manifests identical to clang.manifest, so remote the latter.
deleted file mode 100644
--- a/browser/config/tooltool-manifests/win32/clang.manifest
+++ /dev/null
@@ -1,33 +0,0 @@
-[
- {
- "size": 266240,
- "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
- "algorithm": "sha512",
- "filename": "mozmake.exe"
- },
- {
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
- "size": 97017057,
- "digest": "b726645f9d26c5a3048720b3839166021c1cf91a02d2ff2f10c49adced7455c7352e18b5052084d80bf9d1c40ec1bf72d0397921b8cd23262f89fdbd10def58f",
- "algorithm": "sha512",
- "filename": "rustc.tar.bz2",
- "unpack": true
- },
- {
- "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
- "size": 326656969,
- "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
- "algorithm": "sha512",
- "filename": "vs2015u3.zip",
- "unpack": true
- },
- {
- "version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
- "algorithm": "sha512",
- "visibility": "public",
- "filename": "makecab.tar.bz2",
- "unpack": true,
- "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
- "size": 297118
- }
-]
--- a/browser/config/tooltool-manifests/win32/releng.manifest
+++ b/browser/config/tooltool-manifests/win32/releng.manifest
@@ -24,18 +24,10 @@
{
"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
"algorithm": "sha512",
"visibility": "public",
"filename": "makecab.tar.bz2",
"unpack": true,
"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
"size": 297118
- },
- {
- "version": "clang 5.0pre/r293859",
- "size": 309009013,
- "digest": "cd3ed31acefd185f441632158dde73538c62bab7ebf2a8ec630985ab345938ec522983721ddb1bead1de22d5ac1571d50a958ae002364d739f2a78c6e7244222",
- "algorithm": "sha512",
- "filename": "clang.tar.bz2",
- "unpack": true
}
]
deleted file mode 100644
--- a/browser/config/tooltool-manifests/win64/clang.manifest
+++ /dev/null
@@ -1,34 +0,0 @@
-[
- {
- "size": 266240,
- "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
- "algorithm": "sha512",
- "filename": "mozmake.exe"
- },
- {
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
- "size": 103602526,
- "digest": "558d2d18991ad8b250a5d6b46a55e1ffdffc50d6bdd9cb4b3a945dd3d1143836b32e47f1df612bfea97ca2c02333ed43055b6c3030ecb1632385fb6940c1d246",
- "algorithm": "sha512",
- "visibility": "public",
- "filename": "rustc.tar.bz2",
- "unpack": true
- },
- {
- "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
- "size": 326656969,
- "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
- "algorithm": "sha512",
- "filename": "vs2015u3.zip",
- "unpack": true
- },
- {
- "version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
- "algorithm": "sha512",
- "visibility": "public",
- "filename": "makecab.tar.bz2",
- "unpack": true,
- "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
- "size": 297118
- }
-]
--- a/browser/config/tooltool-manifests/win64/releng.manifest
+++ b/browser/config/tooltool-manifests/win64/releng.manifest
@@ -25,18 +25,10 @@
{
"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
"algorithm": "sha512",
"visibility": "public",
"filename": "makecab.tar.bz2",
"unpack": true,
"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
"size": 297118
- },
- {
- "version": "clang 5.0pre/r293859",
- "size": 313862839,
- "digest": "44dee70d525ea93952af27f943d1cc773311970c31d971d2bc2e3437cce0c899f3a03ddd8e42e86f1b4fd9ab1c4bc1767cdb0406eb4b3934ae4fc272dab830dc",
- "algorithm": "sha512",
- "filename": "clang.tar.bz2",
- "unpack": true
}
]
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -400,17 +400,17 @@ win64-asan/debug:
treeherder:
platform: windows2012-64/asan
symbol: tc(Bd)
tier: 3
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/clang.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_win64_asan_debug.py
run-on-projects: []
toolchains:
- win64-clang-cl
@@ -424,17 +424,17 @@ win64-asan/opt:
treeherder:
platform: windows2012-64/asan
symbol: tc(Bo)
tier: 3
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/clang.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_win64_asan_opt.py
run-on-projects: []
toolchains:
- win64-clang-cl
--- a/taskcluster/ci/static-analysis/kind.yml
+++ b/taskcluster/ci/static-analysis/kind.yml
@@ -80,17 +80,17 @@ jobs:
treeherder:
platform: windows2012-32/debug
symbol: tc(S)
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/clang.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_win32_clang_debug.py
toolchains:
- win32-clang-cl
- win64-sccache
@@ -103,17 +103,17 @@ jobs:
treeherder:
platform: windows2012-32/opt
symbol: tc(S)
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/clang.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_win32_clang.py
toolchains:
- win32-clang-cl
- win64-sccache
@@ -126,17 +126,17 @@ jobs:
treeherder:
platform: windows2012-64/debug
symbol: tc(S)
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/clang.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_win64_clang_debug.py
toolchains:
- win64-clang-cl
- win64-sccache
@@ -149,17 +149,17 @@ jobs:
treeherder:
platform: windows2012-64/opt
symbol: tc(S)
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/clang.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_win64_clang.py
toolchains:
- win64-clang-cl
- win64-sccache
--- a/taskcluster/docker/rust-build/splat_rust.py
+++ b/taskcluster/docker/rust-build/splat_rust.py
@@ -74,21 +74,19 @@ TARGETS = {
'x86_64-unknown-linux-gnu-mac-cross-repack': [
'browser/config/tooltool-manifests/macosx64/cross-releng.manifest',
],
'x86_64-apple-darwin-repack': [
'browser/config/tooltool-manifests/macosx64/clang.manifest',
'browser/config/tooltool-manifests/macosx64/releng.manifest',
],
'x86_64-pc-windows-msvc-repack': [
- 'browser/config/tooltool-manifests/win64/clang.manifest',
'browser/config/tooltool-manifests/win64/releng.manifest',
],
'i686-pc-windows-msvc-repack': [
- 'browser/config/tooltool-manifests/win32/clang.manifest',
'browser/config/tooltool-manifests/win32/releng.manifest',
],
}
if __name__ == '__main__':
if len(sys.argv) < 2:
print('%s PATH' % sys.argv[0])
sys.exit(1)
--- 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,17 +12,17 @@ config = {
'update', # decided by query_is_nightly()
],
'stage_platform': 'win32-st-an-debug',
'debug_build': True,
'enable_signing': False,
'enable_talos_sendchange': False,
'enable_unittest_sendchange': False,
'tooltool_manifest_src': "browser/config/tooltool-manifests/win32/\
-clang.manifest",
+releng.manifest",
'platform_supports_post_upload_to_latest': False,
'objdir': MOZ_OBJDIR,
'perfherder_extra_options': ['static-analysis'],
#### 32 bit build specific #####
'env': {
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),