From bc784842fe0d864367d100d111a7c7537d73bbf8 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 26 Jul 2017 15:27:09 +0900 Subject: [PATCH] Bug 1384418 - Use toolchain dependencies for gcc. r=gps --HG-- extra : rebase_source : 187010d47e94d53abf18cd9acd7073269744d818 --- taskcluster/ci/artifact-build/kind.yml | 1 + taskcluster/ci/build/android.yml | 12 ++++++++++++ taskcluster/ci/build/linux.yml | 20 ++++++++++++++++++++ taskcluster/ci/hazard/kind.yml | 2 ++ taskcluster/ci/spidermonkey/kind.yml | 1 + taskcluster/ci/toolchain/linux.yml | 2 ++ taskcluster/ci/toolchain/macosx.yml | 3 +++ taskcluster/ci/valgrind/kind.yml | 1 + 8 files changed, 42 insertions(+) diff --git a/taskcluster/ci/artifact-build/kind.yml b/taskcluster/ci/artifact-build/kind.yml index 13373747143d..26129deff99e 100644 --- a/taskcluster/ci/artifact-build/kind.yml +++ b/taskcluster/ci/artifact-build/kind.yml @@ -42,4 +42,5 @@ jobs: need-xvfb: true keep-artifacts: false toolchains: + - linux64-gcc - linux64-sccache diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml index 6794dc1da06b..757895d534b8 100644 --- a/taskcluster/ci/build/android.yml +++ b/taskcluster/ci/build/android.yml @@ -23,6 +23,7 @@ android-api-15/debug: custom-build-variant-cfg: api-15-debug tooltool-downloads: internal toolchains: + - linux64-gcc - linux64-sccache android-x86/opt: @@ -50,6 +51,7 @@ android-x86/opt: custom-build-variant-cfg: x86 tooltool-downloads: internal toolchains: + - linux64-gcc - linux64-sccache android-x86-nightly/opt: @@ -81,6 +83,7 @@ android-x86-nightly/opt: custom-build-variant-cfg: x86 tooltool-downloads: internal toolchains: + - linux64-gcc - linux64-sccache android-api-15/opt: @@ -108,6 +111,7 @@ android-api-15/opt: custom-build-variant-cfg: api-15 tooltool-downloads: internal toolchains: + - linux64-gcc - linux64-sccache android-api-15-nightly/opt: @@ -139,6 +143,7 @@ android-api-15-nightly/opt: custom-build-variant-cfg: api-15 tooltool-downloads: internal toolchains: + - linux64-gcc - linux64-sccache android-x86-old-id/opt: @@ -167,6 +172,7 @@ android-x86-old-id/opt: tooltool-downloads: internal run-on-projects: [ 'mozilla-central' ] toolchains: + - linux64-gcc - linux64-sccache android-x86-old-id-nightly/opt: @@ -199,6 +205,7 @@ android-x86-old-id-nightly/opt: tooltool-downloads: internal run-on-projects: [ 'mozilla-central' ] toolchains: + - linux64-gcc - linux64-sccache android-api-15-old-id/opt: @@ -227,6 +234,7 @@ android-api-15-old-id/opt: tooltool-downloads: internal run-on-projects: [ 'mozilla-central' ] toolchains: + - linux64-gcc - linux64-sccache android-api-15-old-id-nightly/opt: @@ -259,6 +267,7 @@ android-api-15-old-id-nightly/opt: tooltool-downloads: internal run-on-projects: [ 'mozilla-central' ] toolchains: + - linux64-gcc - linux64-sccache android-api-15-gradle/opt: @@ -299,6 +308,7 @@ android-api-15-gradle/opt: custom-build-variant-cfg: api-15-gradle tooltool-downloads: internal toolchains: + - linux64-gcc - linux64-sccache android-aarch64/opt: @@ -326,6 +336,7 @@ android-aarch64/opt: custom-build-variant-cfg: aarch64 tooltool-downloads: internal toolchains: + - linux64-gcc - linux64-sccache android-aarch64-nightly/opt: @@ -357,4 +368,5 @@ android-aarch64-nightly/opt: custom-build-variant-cfg: aarch64 tooltool-downloads: internal toolchains: + - linux64-gcc - linux64-sccache diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index 4a71190fc25f..a0549c4185a4 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -22,6 +22,7 @@ linux64/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64-dmd/opt: @@ -50,6 +51,7 @@ linux64-dmd/opt: need-xvfb: true run-on-projects: [ ] toolchains: + - linux64-gcc - linux64-sccache linux64/pgo: @@ -78,6 +80,7 @@ linux64/pgo: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64/debug: @@ -105,6 +108,7 @@ linux64/debug: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64-devedition-nightly/opt: @@ -137,6 +141,7 @@ linux64-devedition-nightly/opt: custom-build-variant-cfg: devedition run-on-projects: [ 'mozilla-beta', ] toolchains: + - linux64-gcc - linux64-sccache linux64-base-toolchains/opt: @@ -164,6 +169,7 @@ linux64-base-toolchains/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64-base-toolchains/debug: @@ -192,6 +198,7 @@ linux64-base-toolchains/debug: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux/opt: @@ -219,6 +226,7 @@ linux/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux/debug: @@ -247,6 +255,7 @@ linux/debug: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux/pgo: @@ -275,6 +284,7 @@ linux/pgo: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux-devedition-nightly/opt: @@ -307,6 +317,7 @@ linux-devedition-nightly/opt: custom-build-variant-cfg: devedition run-on-projects: [ 'mozilla-beta', ] toolchains: + - linux64-gcc - linux64-sccache linux-nightly/opt: @@ -337,6 +348,7 @@ linux-nightly/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache @@ -366,6 +378,7 @@ linux64-asan/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache @@ -395,6 +408,7 @@ linux64-asan-fuzzing/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64-asan/debug: @@ -423,6 +437,7 @@ linux64-asan/debug: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64-nightly/opt: @@ -453,6 +468,7 @@ linux64-nightly/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64-noopt/debug: @@ -483,6 +499,7 @@ linux64-noopt/debug: need-xvfb: true run-on-projects: [ 'trunk', 'try' ] toolchains: + - linux64-gcc - linux64-sccache linux64-jsdcov/opt: @@ -511,6 +528,7 @@ linux64-jsdcov/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64-ccov/opt: @@ -541,6 +559,7 @@ linux64-ccov/opt: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache linux64-add-on-devel/opt: @@ -570,4 +589,5 @@ linux64-add-on-devel/opt: need-xvfb: true run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ] toolchains: + - linux64-gcc - linux64-sccache diff --git a/taskcluster/ci/hazard/kind.yml b/taskcluster/ci/hazard/kind.yml index 2862862f703f..dd480ef728ea 100644 --- a/taskcluster/ci/hazard/kind.yml +++ b/taskcluster/ci/hazard/kind.yml @@ -44,6 +44,7 @@ jobs: - js/public/** - js/src/** toolchains: + - linux64-gcc - linux64-sccache linux64-haz/debug: @@ -64,4 +65,5 @@ jobs: cd /home/worker/checkouts/gecko/taskcluster/scripts/builder && ./build-haz-linux.sh --project browser $HOME/workspace toolchains: + - linux64-gcc - linux64-sccache diff --git a/taskcluster/ci/spidermonkey/kind.yml b/taskcluster/ci/spidermonkey/kind.yml index 42750e5fe0fc..ed5587d4a3a5 100644 --- a/taskcluster/ci/spidermonkey/kind.yml +++ b/taskcluster/ci/spidermonkey/kind.yml @@ -59,6 +59,7 @@ job-defaults: - toolkit/mozapps/installer/package-name.mk - toolkit/mozapps/installer/upload-files.mk toolchains: + - linux64-gcc - linux64-sccache jobs: diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml index ff135f4deff0..5449a17f01c5 100644 --- a/taskcluster/ci/toolchain/linux.yml +++ b/taskcluster/ci/toolchain/linux.yml @@ -23,6 +23,7 @@ linux64-clang: - 'taskcluster/scripts/misc/tooltool-download.sh' toolchain-artifact: public/build/clang.tar.xz toolchains: + - linux64-gcc - linux64-sccache linux64-clang-tidy: @@ -50,6 +51,7 @@ linux64-clang-tidy: - 'taskcluster/scripts/misc/tooltool-download.sh' toolchain-artifact: public/build/clang-tidy.tar.xz toolchains: + - linux64-gcc - linux64-sccache linux64-gcc: diff --git a/taskcluster/ci/toolchain/macosx.yml b/taskcluster/ci/toolchain/macosx.yml index 4e9431a16dfe..fd8a7c29ef4d 100644 --- a/taskcluster/ci/toolchain/macosx.yml +++ b/taskcluster/ci/toolchain/macosx.yml @@ -24,6 +24,7 @@ macosx64-clang: - 'taskcluster/scripts/misc/tooltool-download.sh' toolchain-artifact: public/build/clang.tar.xz toolchains: + - linux64-gcc - linux64-sccache macosx64-clang-tidy: @@ -52,6 +53,7 @@ macosx64-clang-tidy: - 'taskcluster/scripts/misc/tooltool-download.sh' toolchain-artifact: public/build/clang-tidy.tar.xz toolchains: + - linux64-gcc - linux64-sccache macosx64-cctools-port: @@ -75,4 +77,5 @@ macosx64-cctools-port: - 'taskcluster/scripts/misc/tooltool-download.sh' toolchain-artifact: public/build/cctools.tar.bz2 toolchains: + - linux64-gcc - linux64-sccache diff --git a/taskcluster/ci/valgrind/kind.yml b/taskcluster/ci/valgrind/kind.yml index 19f50cfa908d..bcd044b0d728 100644 --- a/taskcluster/ci/valgrind/kind.yml +++ b/taskcluster/ci/valgrind/kind.yml @@ -42,4 +42,5 @@ jobs: tooltool-downloads: public need-xvfb: true toolchains: + - linux64-gcc - linux64-sccache