Commit c2adba67 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1524454 - Use per-type defaults to make toolchain task definitions simpler. r=nalexander 

This change makes no practical modifications, as verified by comparing
the output of `mach taskgraph full -J`.

Differential Revision: https://phabricator.services.mozilla.com/D18307
parent 0a31a301

taskcluster/ci/toolchain/android.yml

+6 −21
Original line number Diff line number Diff line
@@ -2,23 +2,22 @@ 
# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



job-defaults:

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        docker-image: {in-tree: android-build}

        max-run-time: 1800



linux64-android-sdk-linux-repack:

    description: "Android SDK (Linux) repack toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(android-sdk-linux)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        docker-image: {in-tree: android-build}

        max-run-time: 1800

        artifacts:

            - name: project/gecko/android-sdk

              path: /builds/worker/project/gecko/android-sdk/

              type: directory

    run:

        using: toolchain-script

        script: repack-android-sdk-linux.sh

        resources:

            - 'python/mozboot/**/*android*'
@@ -28,20 +27,13 @@ linux64-android-sdk-linux-repack: 
linux64-android-ndk-linux-repack:

    description: "Android NDK (Linux) repack toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(android-ndk-linux)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        docker-image: {in-tree: android-build}

        max-run-time: 1800

        artifacts:

            - name: project/gecko/android-ndk

              path: /builds/worker/project/gecko/android-ndk/

              type: directory

    run:

        using: toolchain-script

        script: repack-android-ndk-linux.sh

        resources:

            - 'python/mozboot/**/*android*'
@@ -51,18 +43,11 @@ linux64-android-ndk-linux-repack: 
linux64-android-gradle-dependencies:

    description: "Android Gradle dependencies toolchain task"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(gradle-dependencies)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        docker-image: {in-tree: android-build}

        env:

            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-online"

        max-run-time: 1800

    run:

        using: toolchain-script

        script: android-gradle-dependencies.sh

        sparse-profile: null

        resources:

taskcluster/ci/toolchain/cbindgen.yml

+10 −29
Original line number Diff line number Diff line
@@ -2,49 +2,39 @@ 
# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



linux64-cbindgen:

job-defaults:

    description: "cbindgen toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(cbindgen)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        max-run-time: 1800

        max-run-time: 3600

    run:

        using: toolchain-script

        script: build-cbindgen.sh

        arguments: ['x86_64-unknown-linux-gnu']

        resources:

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/cbindgen.tar.xz



linux64-cbindgen:

    treeherder:

        symbol: TL(cbindgen)

    worker:

        max-run-time: 1800

    run:

        arguments: ['x86_64-unknown-linux-gnu']

    toolchains:

        - linux64-rust-1.28



macosx64-cbindgen:

    description: "cbindgen toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TM(cbindgen)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        max-run-time: 3600

        env:

            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"

    run-on-projects:

        - trunk

        - try

    run:

        using: toolchain-script

        script: build-cbindgen.sh

        arguments: ['x86_64-apple-darwin']

        tooltool-downloads: internal

        resources:

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/cbindgen.tar.xz

    toolchains:

        - linux64-cctools-port

        - linux64-clang-7
@@ -52,23 +42,14 @@ macosx64-cbindgen: 
        - linux64-rust-macos-1.31



win64-cbindgen:

    description: "cbindgen toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TW64(cbindgen)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012

    worker:

        max-run-time: 3600

        env:

            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"

    run:

        using: toolchain-script

        script: build-cbindgen.sh

        arguments: ['x86_64-pc-windows-msvc']

        resources:

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/cbindgen.tar.bz2

    toolchains:

        - win64-rust-1.28

taskcluster/ci/toolchain/cctools-port.yml

+7 −16
Original line number Diff line number Diff line
@@ -2,21 +2,20 @@ 
# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



linux64-cctools-port:

job-defaults:

    description: "cctools-port toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(cctools)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        max-run-time: 1800

    run:

        using: toolchain-script

        script: build-cctools-port.sh

        resources:

            - 'taskcluster/scripts/misc/tooltool-download.sh'



linux64-cctools-port:

    treeherder:

        symbol: TL(cctools)

    run:

        script: build-cctools-port.sh

        toolchain-artifact: public/build/cctools.tar.xz

    toolchains:

        - linux64-clang-7
@@ -24,24 +23,16 @@ linux64-cctools-port: 
macosx64-cctools-port:

    description: "cctools-port toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TM(cctools)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        max-run-time: 1800

        env:

            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"

    run-on-projects:

        - trunk

        - try

    run:

        using: toolchain-script

        script: build-cctools-port-macosx.sh

        tooltool-downloads: internal

        resources:

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/cctools.tar.bz2

    toolchains:

        - linux64-cctools-port

taskcluster/ci/toolchain/clang-tidy.yml

+11 −46
Original line number Diff line number Diff line
@@ -2,22 +2,15 @@ 
# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



linux64-clang-tidy:

job-defaults:

    description: "Clang-tidy build"

    index:

        product: static-analysis

        job-name: linux64-clang-tidy

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(clang-tidy)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-large

    worker:

        max-run-time: 3600

    run:

        using: toolchain-script

        script: build-clang-tidy-linux.sh

        toolchain-artifact: public/build/clang-tidy.tar.xz

        resources:

            - 'build/clang-plugin/**/*.cpp'

            - 'build/clang-plugin/**/*.h'
@@ -26,9 +19,17 @@ linux64-clang-tidy: 
            - 'build/clang-plugin/moz.build'

            - 'build/clang-plugin/Makefile.in'

            - 'build/build-clang/build-clang.py'



linux64-clang-tidy:

    index:

        job-name: linux64-clang-tidy

    treeherder:

        symbol: TL(clang-tidy)

    run:

        script: build-clang-tidy-linux.sh

        resources:

            - 'build/build-clang/clang-tidy-linux64.json'

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/clang-tidy.tar.xz

    run-on-projects:

        - trunk

        - try
@@ -36,18 +37,12 @@ linux64-clang-tidy: 
        - linux64-gcc-4.9



macosx64-clang-tidy:

    description: "Clang-tidy build"

    index:

        product: static-analysis

        job-name: macosx64-clang-tidy

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TM(clang-tidy)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-large

    worker:

        max-run-time: 3600

        env:

            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"

    run-on-projects:
@@ -58,16 +53,8 @@ macosx64-clang-tidy: 
        script: build-clang-tidy-macosx.sh

        tooltool-downloads: internal

        resources:

            - 'build/clang-plugin/**/*.cpp'

            - 'build/clang-plugin/**/*.h'

            - 'build/clang-plugin/*.inc'

            - 'build/clang-plugin/*.py'

            - 'build/clang-plugin/moz.build'

            - 'build/clang-plugin/Makefile.in'

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-tidy-macosx64.json'

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/clang-tidy.tar.xz

    toolchains:

        - linux64-cctools-port

        - linux64-clang-7
@@ -77,11 +64,8 @@ macosx64-clang-tidy: 
win32-clang-tidy:

    description: "Clang-tidy toolchain build"

    index:

        product: static-analysis

        job-name: win32-clang-tidy

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TW32(clang-tidy)

        tier: 2

    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
@@ -90,16 +74,8 @@ win32-clang-tidy: 
        env:

            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"

    run:

        using: toolchain-script

        script: build-clang-tidy32-windows.sh

        resources:

            - 'build/clang-plugin/**/*.cpp'

            - 'build/clang-plugin/**/*.h'

            - 'build/clang-plugin/*.inc'

            - 'build/clang-plugin/*.py'

            - 'build/clang-plugin/moz.build'

            - 'build/clang-plugin/Makefile.in'

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-tidy-win32.json'

            - 'taskcluster/scripts/misc/build-clang-windows-helper32.sh'

        toolchain-artifact: public/build/clang-tidy.tar.bz2
@@ -110,11 +86,8 @@ win32-clang-tidy: 
win64-clang-tidy:

    description: "Clang-tidy toolchain build"

    index:

        product: static-analysis

        job-name: win64-clang-tidy

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TW64(clang-tidy)

        tier: 2

    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
@@ -123,16 +96,8 @@ win64-clang-tidy: 
        env:

            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"

    run:

        using: toolchain-script

        script: build-clang-tidy64-windows.sh

        resources:

            - 'build/clang-plugin/**/*.cpp'

            - 'build/clang-plugin/**/*.h'

            - 'build/clang-plugin/*.inc'

            - 'build/clang-plugin/*.py'

            - 'build/clang-plugin/moz.build'

            - 'build/clang-plugin/Makefile.in'

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-tidy-win32.json'

            - 'taskcluster/scripts/misc/build-clang-windows-helper64.sh'

        toolchain-artifact: public/build/clang-tidy.tar.bz2

taskcluster/ci/toolchain/clang.yml

+8 −51
Original line number Diff line number Diff line
@@ -2,21 +2,22 @@ 
# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



job-defaults:

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge

    worker:

        max-run-time: 7200

    run:

        resources:

            - 'build/build-clang/build-clang.py'



linux64-clang-3.9:

    description: "Clang 3.9 toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(clang3.9)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-large

    worker:

        max-run-time: 7200

    run:

        using: toolchain-script

        script: build-clang-3.9-linux.sh

        resources:

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-3.9-linux64.json'

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/clang.tar.xz
@@ -26,13 +27,7 @@ linux64-clang-3.9: 
linux64-clang-7:

    description: "Clang 7 toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(clang7)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge

    worker:

        max-run-time: 7200

    run:

        using: toolchain-script

        script: build-clang-7-linux.sh
@@ -48,21 +43,13 @@ linux64-clang-7: 
linux64-clang-trunk-mingw-x86:

    description: "MinGW-Clang Trunk x86 toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TMW(clang-x86)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge

    worker:

        max-run-time: 7200

    run:

        using: toolchain-script

        script: build-clang-trunk-mingw.sh

        arguments: [

            'x86'

        ]

        resources:

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-trunk-mingw.json'

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/clangmingw.tar.xz
@@ -72,21 +59,14 @@ linux64-clang-trunk-mingw-x86: 
linux64-clang-trunk-mingw-x64:

    description: "MinGW-Clang Trunk x64 toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TMW(clang-x64)

        tier: 2

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge

    worker:

        max-run-time: 7200

    run:

        using: toolchain-script

        script: build-clang-trunk-mingw.sh

        arguments: [

            'x64'

        ]

        resources:

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-trunk-mingw.json'

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/clangmingw.tar.xz
@@ -96,18 +76,11 @@ linux64-clang-trunk-mingw-x64: 
linux64-clang-7-android-cross:

    description: "Clang 7 toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(clang7-android)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge

    worker:

        max-run-time: 7200

    run:

        using: toolchain-script

        script: build-clang-7-android.sh

        resources:

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-7-android.json'

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-alias: linux64-clang-android-cross
@@ -119,20 +92,15 @@ linux64-clang-7-android-cross: 
linux64-clang-7-macosx-cross:

    description: "Clang 7 toolchain build with MacOS Compiler RT libs"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TL(clang7-macosx-cross)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux

    worker:

        max-run-time: 3600

        env:

            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"

    run:

        using: toolchain-script

        script: build-clang-7-linux-macosx-cross.sh

        resources:

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-7-macosx64.json'

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-alias: linux64-clang-macosx-cross
@@ -146,10 +114,7 @@ linux64-clang-7-macosx-cross: 
macosx64-clang:

    description: "Clang toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TM(clang)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-large

    worker:

        max-run-time: 3600
@@ -159,11 +124,9 @@ macosx64-clang: 
        - trunk

        - try

    run:

        using: toolchain-script

        script: build-clang-macosx.sh

        tooltool-downloads: internal

        resources:

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-7-macosx64.json'

            - 'taskcluster/scripts/misc/tooltool-download.sh'

        toolchain-artifact: public/build/clang.tar.xz
@@ -176,20 +139,14 @@ macosx64-clang: 
win64-clang-cl:

    description: "Clang-cl toolchain build"

    treeherder:

        kind: build

        platform: toolchains/opt

        symbol: TW64(clang-cl)

        tier: 1

    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012

    worker:

        max-run-time: 7200

        env:

            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"

    run:

        using: toolchain-script

        script: build-clang64-windows.sh

        resources:

            - 'build/build-clang/build-clang.py'

            - 'build/build-clang/clang-win64.json'

            - 'taskcluster/scripts/misc/build-clang-windows-helper64.sh'

        toolchain-artifact: public/build/clang.tar.bz2