From 370b8cf0ffa1d6813bf666595a3b12ecd19b946a Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 22 Dec 2017 07:54:58 +0900 Subject: [PATCH] Bug 1426785 - Remove uses of the gtk+3 tooltool package. r=gps It turns out that in all cases it was the last tooltool manifest entry, so we can remove the tooltool manifests entirely, and remove all references to them. --HG-- extra : rebase_source : 0aa9ef8151c2fccf62507dfecc0bc57b157772e1 --- .../linux32/releng.manifest | 10 ----- .../linux64/base-toolchains.manifest | 10 ----- .../linux64/releng.manifest | 10 ----- .../tooltool-manifests/linux64/tsan.manifest | 10 ----- .../devtools/rootAnalysis/build/gcc.manifest | 10 ----- taskcluster/ci/artifact-build/kind.yml | 2 - taskcluster/ci/build/linux.yml | 41 ------------------- taskcluster/ci/hazard/kind.yml | 6 --- taskcluster/ci/searchfox/kind.yml | 2 - taskcluster/ci/spidermonkey/kind.yml | 4 -- taskcluster/ci/static-analysis/kind.yml | 4 -- taskcluster/ci/valgrind/kind.yml | 2 - 12 files changed, 111 deletions(-) delete mode 100644 browser/config/tooltool-manifests/linux32/releng.manifest delete mode 100644 browser/config/tooltool-manifests/linux64/base-toolchains.manifest delete mode 100644 browser/config/tooltool-manifests/linux64/releng.manifest delete mode 100644 browser/config/tooltool-manifests/linux64/tsan.manifest delete mode 100644 js/src/devtools/rootAnalysis/build/gcc.manifest diff --git a/browser/config/tooltool-manifests/linux32/releng.manifest b/browser/config/tooltool-manifests/linux32/releng.manifest deleted file mode 100644 index 2d7640baa6cd..000000000000 --- a/browser/config/tooltool-manifests/linux32/releng.manifest +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "size": 11189216, - "digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6", - "algorithm": "sha512", - "filename": "gtk3.tar.xz", - "setup": "setup.sh", - "unpack": true - } -] diff --git a/browser/config/tooltool-manifests/linux64/base-toolchains.manifest b/browser/config/tooltool-manifests/linux64/base-toolchains.manifest deleted file mode 100644 index f4061486178c..000000000000 --- a/browser/config/tooltool-manifests/linux64/base-toolchains.manifest +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "size": 12072532, - "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", - "algorithm": "sha512", - "filename": "gtk3.tar.xz", - "setup": "setup.sh", - "unpack": true - } -] diff --git a/browser/config/tooltool-manifests/linux64/releng.manifest b/browser/config/tooltool-manifests/linux64/releng.manifest deleted file mode 100644 index f4061486178c..000000000000 --- a/browser/config/tooltool-manifests/linux64/releng.manifest +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "size": 12072532, - "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", - "algorithm": "sha512", - "filename": "gtk3.tar.xz", - "setup": "setup.sh", - "unpack": true - } -] diff --git a/browser/config/tooltool-manifests/linux64/tsan.manifest b/browser/config/tooltool-manifests/linux64/tsan.manifest deleted file mode 100644 index f4061486178c..000000000000 --- a/browser/config/tooltool-manifests/linux64/tsan.manifest +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "size": 12072532, - "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", - "algorithm": "sha512", - "filename": "gtk3.tar.xz", - "setup": "setup.sh", - "unpack": true - } -] diff --git a/js/src/devtools/rootAnalysis/build/gcc.manifest b/js/src/devtools/rootAnalysis/build/gcc.manifest deleted file mode 100644 index f4061486178c..000000000000 --- a/js/src/devtools/rootAnalysis/build/gcc.manifest +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "size": 12072532, - "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", - "algorithm": "sha512", - "filename": "gtk3.tar.xz", - "setup": "setup.sh", - "unpack": true - } -] diff --git a/taskcluster/ci/artifact-build/kind.yml b/taskcluster/ci/artifact-build/kind.yml index 834bf31dfe0b..a4540ee16811 100644 --- a/taskcluster/ci/artifact-build/kind.yml +++ b/taskcluster/ci/artifact-build/kind.yml @@ -29,8 +29,6 @@ jobs: worker: docker-image: {in-tree: desktop-build} max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build] diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index 15f43111f474..816807934f83 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -9,8 +9,6 @@ linux64/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -40,8 +38,6 @@ linux64-dmd/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -72,8 +68,6 @@ linux64/pgo: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -105,7 +99,6 @@ linux64-fuzzing/debug: max-run-time: 36000 env: PERFHERDER_EXTRA_OPTIONS: fuzzing - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -135,8 +128,6 @@ linux64/debug: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -171,8 +162,6 @@ linux64-devedition-nightly/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -207,7 +196,6 @@ linux64-base-toolchains/opt: max-run-time: 36000 env: PERFHERDER_EXTRA_OPTIONS: base-toolchains - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/base-toolchains.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -238,7 +226,6 @@ linux64-base-toolchains/debug: max-run-time: 36000 env: PERFHERDER_EXTRA_OPTIONS: base-toolchains - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/base-toolchains.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -268,8 +255,6 @@ linux/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -298,8 +283,6 @@ linux/debug: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -329,8 +312,6 @@ linux/pgo: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -363,7 +344,6 @@ linux-rusttests/opt: max-run-time: 5400 env: PERFHERDER_EXTRA_OPTIONS: rusttests - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -398,7 +378,6 @@ linux-rusttests/debug: max-run-time: 5400 env: PERFHERDER_EXTRA_OPTIONS: rusttests - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -435,8 +414,6 @@ linux-devedition-nightly/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -474,8 +451,6 @@ linux-nightly/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -507,7 +482,6 @@ linux64-asan/opt: worker: env: PERFHERDER_EXTRA_OPTIONS: "opt asan" - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" max-run-time: 36000 run: using: mozharness @@ -540,7 +514,6 @@ linux64-asan-fuzzing/opt: worker: env: PERFHERDER_EXTRA_OPTIONS: asan-fuzzing - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" max-run-time: 36000 run: using: mozharness @@ -572,7 +545,6 @@ linux64-asan-reporter/opt: worker: env: PERFHERDER_EXTRA_OPTIONS: asan-reporter - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" max-run-time: 36000 run: using: mozharness @@ -604,7 +576,6 @@ linux64-asan/debug: worker: env: PERFHERDER_EXTRA_OPTIONS: "debug asan" - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" max-run-time: 36000 run: using: mozharness @@ -640,8 +611,6 @@ linux64-nightly/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -672,8 +641,6 @@ linux64-noopt/debug: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 3600 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -708,7 +675,6 @@ linux64-rusttests/opt: max-run-time: 5400 env: PERFHERDER_EXTRA_OPTIONS: rusttests - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -743,7 +709,6 @@ linux64-rusttests/debug: max-run-time: 5400 env: PERFHERDER_EXTRA_OPTIONS: rusttests - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -777,8 +742,6 @@ linux64-jsdcov/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -809,8 +772,6 @@ linux64-ccov/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] @@ -840,8 +801,6 @@ linux64-add-on-devel/opt: worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build check-test update] diff --git a/taskcluster/ci/hazard/kind.yml b/taskcluster/ci/hazard/kind.yml index d1c6c56dbfe1..aa9b89e470ce 100644 --- a/taskcluster/ci/hazard/kind.yml +++ b/taskcluster/ci/hazard/kind.yml @@ -31,9 +31,6 @@ jobs: treeherder: platform: linux64/debug symbol: SM-tc(H) - worker: - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: hazard command: > @@ -57,9 +54,6 @@ jobs: treeherder: platform: linux64/debug symbol: tc(H) - worker: - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: hazard mozconfig: "browser/config/mozconfigs/linux64/hazards" diff --git a/taskcluster/ci/searchfox/kind.yml b/taskcluster/ci/searchfox/kind.yml index 995e8c027172..f2aaab5090f6 100644 --- a/taskcluster/ci/searchfox/kind.yml +++ b/taskcluster/ci/searchfox/kind.yml @@ -33,8 +33,6 @@ jobs: worker: docker-image: {in-tree: desktop-build} max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [clobber build] diff --git a/taskcluster/ci/spidermonkey/kind.yml b/taskcluster/ci/spidermonkey/kind.yml index 6b4138bef28b..af530d71e9d4 100644 --- a/taskcluster/ci/spidermonkey/kind.yml +++ b/taskcluster/ci/spidermonkey/kind.yml @@ -201,8 +201,6 @@ jobs: worker: max-run-time: 36000 docker-image: {in-tree: desktop-build} - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest" run: spidermonkey-variant: arm-sim @@ -292,8 +290,6 @@ jobs: worker: max-run-time: 36000 docker-image: {in-tree: desktop-build} - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/tsan.manifest" run: spidermonkey-variant: tsan diff --git a/taskcluster/ci/static-analysis/kind.yml b/taskcluster/ci/static-analysis/kind.yml index 21752b7fc170..060623a499c6 100644 --- a/taskcluster/ci/static-analysis/kind.yml +++ b/taskcluster/ci/static-analysis/kind.yml @@ -32,8 +32,6 @@ jobs: worker: docker-image: {in-tree: desktop-build} max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [build] @@ -59,8 +57,6 @@ jobs: worker: docker-image: {in-tree: desktop-build} max-run-time: 36000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [build] diff --git a/taskcluster/ci/valgrind/kind.yml b/taskcluster/ci/valgrind/kind.yml index 06350a24cfd0..c33690784d6f 100644 --- a/taskcluster/ci/valgrind/kind.yml +++ b/taskcluster/ci/valgrind/kind.yml @@ -28,8 +28,6 @@ jobs: worker: docker-image: {in-tree: valgrind-build} max-run-time: 72000 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest" run: using: mozharness actions: [get-secrets build valgrind-test]