From ffe06072165e1609594766a58aa21f61a75f72cf Mon Sep 17 00:00:00 2001 From: David Major Date: Thu, 27 Aug 2020 16:26:23 +0000 Subject: [PATCH] Bug 1660340 - Switch builds to clang 11.0.0 rc2 r=froydnj This changes most of our automation builds to clang 11.0.0 rc2. Not included: * code coverage builds, per bug 1660341 * mingw builds, which have traditionally been on their own update cadence, and in this case are blocked anyway by bug 1658632 This will leave some unused clang-9 task definitions. I intend to clean them up, but at a later date. For now I want to focus on making sure this update sticks, since patches like this have a tendency to bounce. Differential Revision: https://phabricator.services.mozilla.com/D88313 --- taskcluster/ci/toolchain/cctools-port.yml | 2 +- taskcluster/ci/toolchain/clang.yml | 16 ++++++++-------- taskcluster/ci/toolchain/misc.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/taskcluster/ci/toolchain/cctools-port.yml b/taskcluster/ci/toolchain/cctools-port.yml index 8f4b924c8823..a603cf9fe1de 100644 --- a/taskcluster/ci/toolchain/cctools-port.yml +++ b/taskcluster/ci/toolchain/cctools-port.yml @@ -17,7 +17,6 @@ linux64-cctools-port-clang-9: symbol: TL(cctools) run: script: build-cctools-port.sh - toolchain-alias: linux64-cctools-port toolchain-artifact: public/build/cctools.tar.xz tooltool-downloads: internal fetches: @@ -42,6 +41,7 @@ linux64-cctools-port-clang-11: symbol: TL(cctools-clang-11) run: script: build-cctools-port.sh + toolchain-alias: linux64-cctools-port toolchain-artifact: public/build/cctools.tar.xz tooltool-downloads: internal fetches: diff --git a/taskcluster/ci/toolchain/clang.yml b/taskcluster/ci/toolchain/clang.yml index 44b06befcd49..139b6f002997 100644 --- a/taskcluster/ci/toolchain/clang.yml +++ b/taskcluster/ci/toolchain/clang.yml @@ -62,7 +62,6 @@ linux64-clang-9: - 'build/build-clang/clang-linux64.json' resources: - 'build/build-clang/clang-linux64.json' - toolchain-alias: linux64-clang toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -132,7 +131,6 @@ linux64-clang-9-android-cross: - 'build/build-clang/clang-android.json' resources: - 'build/build-clang/clang-android.json' - toolchain-alias: linux64-clang-android-cross toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -157,7 +155,6 @@ linux64-clang-9-aarch64-cross: - 'build/build-clang/clang-linux64-aarch64-cross.json' resources: - 'build/build-clang/clang-linux64-aarch64-cross.json' - toolchain-alias: linux64-clang-aarch64-cross toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -175,7 +172,6 @@ linux64-clang-9-macosx-cross: max-run-time: 600 run: script: repack-clang-linux-macosx-cross.sh - toolchain-alias: linux64-clang-macosx-cross toolchain-artifact: public/build/clang.tar.zst dependencies: macosx64-clang-9: toolchain-macosx64-clang-9 @@ -196,7 +192,6 @@ linux64-clang-9-win-cross: max-run-time: 600 run: script: repack-clang-linux-win-cross.sh - toolchain-alias: linux64-clang-win-cross toolchain-artifact: public/build/clang.tar.zst dependencies: win64-clang-cl-9-2stage: toolchain-win64-clang-cl-9-2stage @@ -251,7 +246,6 @@ macosx64-clang-9: resources: - 'build/build-clang/clang-macosx64.json' - 'taskcluster/scripts/misc/tooltool-download.sh' - toolchain-alias: macosx64-clang toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -282,7 +276,6 @@ win64-clang-cl-9: resources: - 'build/build-clang/clang-win64.json' - 'taskcluster/scripts/misc/tooltool-download.sh' - toolchain-alias: win64-clang-cl toolchain-artifact: public/build/clang.tar.zst tooltool-downloads: internal fetches: @@ -306,7 +299,6 @@ win64-clang-cl-9-2stage: resources: - 'build/build-clang/clang-win64-2stage.json' - 'taskcluster/scripts/misc/tooltool-download.sh' - toolchain-alias: win64-clang-cl-2stage toolchain-artifact: public/build/clang.tar.zst tooltool-downloads: internal fetches: @@ -329,6 +321,7 @@ linux64-clang-11: - 'build/build-clang/clang-11-linux64.json' resources: - 'build/build-clang/clang-11-linux64.json' + toolchain-alias: linux64-clang toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -349,6 +342,7 @@ linux64-clang-11-android-cross: - 'build/build-clang/clang-11-android.json' resources: - 'build/build-clang/clang-11-android.json' + toolchain-alias: linux64-clang-android-cross toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -373,6 +367,7 @@ linux64-clang-11-aarch64-cross: - 'build/build-clang/clang-11-linux64-aarch64-cross.json' resources: - 'build/build-clang/clang-11-linux64-aarch64-cross.json' + toolchain-alias: linux64-clang-aarch64-cross toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -390,6 +385,7 @@ linux64-clang-11-macosx-cross: max-run-time: 600 run: script: repack-clang-linux-macosx-cross.sh + toolchain-alias: linux64-clang-macosx-cross toolchain-artifact: public/build/clang.tar.zst dependencies: macosx64-clang-11: toolchain-macosx64-clang-11 @@ -410,6 +406,7 @@ linux64-clang-11-win-cross: max-run-time: 600 run: script: repack-clang-linux-win-cross.sh + toolchain-alias: linux64-clang-win-cross toolchain-artifact: public/build/clang.tar.zst dependencies: win64-clang-cl-11-2stage: toolchain-win64-clang-cl-11-2stage @@ -443,6 +440,7 @@ macosx64-clang-11: resources: - 'build/build-clang/clang-11-macosx64.json' - 'taskcluster/scripts/misc/tooltool-download.sh' + toolchain-alias: macosx64-clang toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -479,6 +477,7 @@ win64-clang-cl-11: resources: - 'build/build-clang/clang-11-win64.json' - 'taskcluster/scripts/misc/tooltool-download.sh' + toolchain-alias: win64-clang-cl toolchain-artifact: public/build/clang.tar.zst tooltool-downloads: internal fetches: @@ -502,6 +501,7 @@ win64-clang-cl-11-2stage: resources: - 'build/build-clang/clang-11-win64-2stage.json' - 'taskcluster/scripts/misc/tooltool-download.sh' + toolchain-alias: win64-clang-cl-2stage toolchain-artifact: public/build/clang.tar.zst tooltool-downloads: internal fetches: diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml index b61aaee259a5..d53962f9cb46 100644 --- a/taskcluster/ci/toolchain/misc.yml +++ b/taskcluster/ci/toolchain/misc.yml @@ -151,7 +151,6 @@ wasi-sysroot-9: script: build-wasi-sysroot.sh sparse-profile: null toolchain-artifact: public/build/wasi-sysroot.tar.xz - toolchain-alias: wasi-sysroot fetches: fetch: - clang-9 @@ -170,6 +169,7 @@ wasi-sysroot-11: run: script: build-wasi-sysroot.sh sparse-profile: null + toolchain-alias: wasi-sysroot toolchain-artifact: public/build/wasi-sysroot.tar.xz fetches: fetch: