diff options
| -rw-r--r-- | .taskcluster.yml | 4 | ||||
| -rw-r--r-- | automation/taskcluster/docker/setup.sh | 13 | ||||
| -rw-r--r-- | automation/taskcluster/graph/graph.yml | 69 |
3 files changed, 74 insertions, 12 deletions
diff --git a/.taskcluster.yml b/.taskcluster.yml index fb98f16d9..4cb78bf26 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -64,14 +64,14 @@ tasks: - "tc-treeherder.nss.{{revision_hash}}" payload: - image: "ttaubert/nss-ci:0.0.15" + image: "ttaubert/nss-ci:0.0.16" env: TC_OWNER: {{owner}} TC_SOURCE: {{{source}}} TC_REVISION: '{{revision}}' TC_REVISION_HASH: '{{revision_hash}}' - TC_DOCKER_IMAGE: "ttaubert/nss-ci:0.0.15" + TC_DOCKER_IMAGE: "ttaubert/nss-ci:0.0.16" TC_PROVISIONER_ID: "aws-provisioner-v1" TC_WORKER_TYPE: "hg-worker" NSS_HEAD_REPOSITORY: '{{{url}}}' diff --git a/automation/taskcluster/docker/setup.sh b/automation/taskcluster/docker/setup.sh index f3b413027..5edb12bc7 100644 --- a/automation/taskcluster/docker/setup.sh +++ b/automation/taskcluster/docker/setup.sh @@ -22,7 +22,8 @@ apt-get -y update export DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends curl apt-utils -# clang-format-3.8 +# clang(-format)-3.8 +apt_packages+=('clang-3.8') apt_packages+=('clang-format-3.8') curl http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - echo "deb http://llvm.org/apt/xenial/ llvm-toolchain-xenial-3.8 main" > /etc/apt/sources.list.d/docker.list @@ -34,9 +35,9 @@ apt-get install -y --no-install-recommends ${apt_packages[@]} # gcc 6 apt_packages=() apt_packages+=('g++-6') -apt_packages+=('g++-4.6') +apt_packages+=('g++-4.8') apt_packages+=('g++-6-multilib') -apt_packages+=('g++-4.6-multilib') +apt_packages+=('g++-4.8-multilib') apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" > /etc/apt/sources.list.d/toolchain.list @@ -48,8 +49,10 @@ apt-get install -y --no-install-recommends ${apt_packages[@]} ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include # Compiler options. -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 10 -update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.6 10 +update-alternatives --install /usr/bin/gcc gcc /usr/bin/clang-3.8 5 +update-alternatives --install /usr/bin/g++ g++ /usr/bin/clang++-3.8 5 +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 10 +update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 10 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 20 update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 20 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 30 diff --git a/automation/taskcluster/graph/graph.yml b/automation/taskcluster/graph/graph.yml index 8bfed96bf..4bd518bc7 100644 --- a/automation/taskcluster/graph/graph.yml +++ b/automation/taskcluster/graph/graph.yml @@ -14,22 +14,36 @@ templates: treeherder: symbol: B - builder_gcc4: + builder_no_tests: extends: builder + treeherder: + groupSymbol: Compilers + groupName: Various compilers + + builder_gcc4: + extends: builder_no_tests env: - GCC_VERSION: gcc-4.6 - GXX_VERSION: g++-4.6 + GCC_VERSION: gcc-4.8 + GXX_VERSION: g++-4.8 treeherder: symbol: gcc4 builder_gcc6: - extends: builder + extends: builder_no_tests env: GCC_VERSION: gcc-6 GXX_VERSION: g++-6 treeherder: symbol: gcc6 + builder_clang: + extends: builder_no_tests + env: + GCC_VERSION: clang-3.8 + GXX_VERSION: clang++-3.8 + treeherder: + symbol: clang + builder_with_tests: extends: builder subtasks: @@ -62,7 +76,7 @@ templates: env: NSS_TESTS: "memleak" treeherder: - groupSymbol: ML + groupSymbol: MemLeak groupName: MemLeak tests ## Test Definitions ######################################################### @@ -428,6 +442,51 @@ graph: collection: opt: true + ## Clang 3.8 ################################################################ + + build-32-debug-clang: + name: "Linux 32 (debug, clang)" + extends: builder_clang + treeherder: + build: + platform: linux32 + collection: + debug: true + + build-32-opt-clang: + name: "Linux 32 (opt, clang)" + extends: builder_clang + env: + BUILD_OPT: 1 + treeherder: + build: + platform: linux32 + collection: + opt: true + + build-64-debug-clang: + name: "Linux 64 (debug, clang)" + extends: builder_clang + env: + USE_64: 1 + treeherder: + build: + platform: linux64 + collection: + debug: true + + build-64-opt-clang: + name: "Linux 64 (opt, clang)" + extends: builder_clang + env: + BUILD_OPT: 1 + USE_64: 1 + treeherder: + build: + platform: linux64 + collection: + opt: true + ## Tools #################################################################### clang-format: |