diff --git a/browser/config/mozconfigs/linux32/opt-dmd b/browser/config/mozconfigs/linux32/opt-dmd deleted file mode 100644 index 30f47865768f..000000000000 --- a/browser/config/mozconfigs/linux32/opt-dmd +++ /dev/null @@ -1,3 +0,0 @@ -ac_add_options --enable-dmd - -. "$topsrcdir/browser/config/mozconfigs/linux32/nightly" diff --git a/browser/config/mozconfigs/linux64/opt-dmd b/browser/config/mozconfigs/linux64/opt-dmd deleted file mode 100644 index 43f67b50fb3b..000000000000 --- a/browser/config/mozconfigs/linux64/opt-dmd +++ /dev/null @@ -1,3 +0,0 @@ -ac_add_options --enable-dmd - -. "$topsrcdir/browser/config/mozconfigs/linux64/nightly" diff --git a/browser/config/mozconfigs/macosx64/opt-dmd b/browser/config/mozconfigs/macosx64/opt-dmd deleted file mode 100644 index b7d4a8e72a25..000000000000 --- a/browser/config/mozconfigs/macosx64/opt-dmd +++ /dev/null @@ -1,5 +0,0 @@ -ac_add_options --enable-dmd - -. "$topsrcdir/browser/config/mozconfigs/macosx64/nightly" - -ac_add_options --disable-lto diff --git a/browser/config/mozconfigs/win32/opt-dmd b/browser/config/mozconfigs/win32/opt-dmd deleted file mode 100644 index 47fd66396c7a..000000000000 --- a/browser/config/mozconfigs/win32/opt-dmd +++ /dev/null @@ -1,3 +0,0 @@ -ac_add_options --enable-dmd - -. "$topsrcdir/browser/config/mozconfigs/win32/nightly" diff --git a/browser/config/mozconfigs/win64/opt-dmd b/browser/config/mozconfigs/win64/opt-dmd deleted file mode 100644 index cab0e8e294cf..000000000000 --- a/browser/config/mozconfigs/win64/opt-dmd +++ /dev/null @@ -1,3 +0,0 @@ -ac_add_options --enable-dmd - -. "$topsrcdir/browser/config/mozconfigs/win64/nightly" diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index cd24f88a15ae..44ba2cb990ca 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -60,40 +60,6 @@ linux64-plain/opt: - linux64-node - linux64-cbindgen -linux64-dmd/opt: - description: "Linux64 DMD Opt" - index: - product: firefox - job-name: linux64-dmd-opt - treeherder: - platform: linux64-dmd/opt - symbol: Bdmd - tier: 2 - worker-type: aws-provisioner-v1/gecko-{level}-b-linux - worker: - max-run-time: 3600 - run: - using: mozharness - actions: [get-secrets build check-test] - config: - - builds/releng_base_firefox.py - - builds/releng_base_linux_64_builds.py - script: "mozharness/scripts/fx_desktop_build.py" - extra-config: - mozconfig_variant: 'opt-dmd' - secrets: true - tooltool-downloads: public - need-xvfb: true - run-on-projects: [] - toolchains: - - linux64-binutils - - linux64-clang - - linux64-rust - - linux64-rust-size - - linux64-cbindgen - - linux64-sccache - - linux64-node - linux64/pgo: description: "Linux64 PGO" index: diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml index bdb14c9fd4ef..b697a99fdb60 100644 --- a/taskcluster/ci/build/macosx.yml +++ b/taskcluster/ci/build/macosx.yml @@ -109,44 +109,6 @@ macosx64-asan-fuzzing/opt: - linux64-sccache - linux64-node -macosx64-dmd/opt: - description: "MacOS X x64 DMD Cross-compile" - index: - product: firefox - job-name: macosx64-dmd-opt - treeherder: - platform: osx-10-10-dmd/opt - symbol: Bdmd - tier: 2 - worker-type: aws-provisioner-v1/gecko-{level}-b-linux - worker: - max-run-time: 3600 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest" - run: - using: mozharness - actions: [get-secrets build] - config: - - builds/releng_base_firefox.py - - builds/releng_base_mac_64_cross_builds.py - script: "mozharness/scripts/fx_desktop_build.py" - extra-config: - mozconfig_variant: 'opt-dmd' - secrets: true - tooltool-downloads: internal - run-on-projects: [] - toolchains: - - linux64-cctools-port - - linux64-clang - - linux64-hfsplus - - linux64-libdmg - - linux64-llvm-dsymutil - - linux64-rust-macos - - linux64-rust-size - - linux64-cbindgen - - linux64-sccache - - linux64-node - macosx64-devedition-nightly/opt: description: "MacOS X Dev Edition x64 Nightly" attributes: diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml index d21ca20cd95d..5a3b4e6d6e31 100755 --- a/taskcluster/ci/build/windows.yml +++ b/taskcluster/ci/build/windows.yml @@ -70,40 +70,6 @@ win32/opt: - win64-sccache - win64-node -win32-dmd/opt: - description: "Win32 DMD Opt" - index: - product: firefox - job-name: win32-dmd-opt - treeherder: - platform: windows2012-32-dmd/opt - symbol: Bdmd - tier: 2 - worker-type: aws-provisioner-v1/gecko-{level}-b-win2012 - worker: - max-run-time: 7200 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" - run: - using: mozharness - options: [append-env-variables-from-configs] - script: mozharness/scripts/fx_desktop_build.py - config: - - builds/releng_base_firefox.py - - builds/taskcluster_base_windows.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/opt.py - extra-config: - mozconfig_variant: 'opt-dmd' - run-on-projects: [] - toolchains: - - win64-clang-cl - - win64-rust - - win64-rust-size - - win64-cbindgen - - win64-sccache - - win64-node - win32/pgo: description: "Win32 Opt PGO" index: @@ -265,40 +231,6 @@ win64-plain/opt: - win64-node - win64-cbindgen -win64-dmd/opt: - description: "Win64 DMD Opt" - index: - product: firefox - job-name: win64-dmd-opt - treeherder: - platform: windows2012-64-dmd/opt - symbol: Bdmd - tier: 2 - worker-type: aws-provisioner-v1/gecko-{level}-b-win2012 - worker: - max-run-time: 7200 - env: - TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" - run: - using: mozharness - options: [append-env-variables-from-configs] - script: mozharness/scripts/fx_desktop_build.py - config: - - builds/releng_base_firefox.py - - builds/taskcluster_base_windows.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/opt.py - extra-config: - mozconfig_variant: 'opt-dmd' - run-on-projects: [] - toolchains: - - win64-clang-cl - - win64-rust - - win64-rust-size - - win64-cbindgen - - win64-sccache - - win64-node - win32-nightly/opt: description: "Win32 Nightly" index: diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py index 71e8dc54b8c5..824f6e6a4461 100644 --- a/taskcluster/taskgraph/target_tasks.py +++ b/taskcluster/taskgraph/target_tasks.py @@ -553,16 +553,6 @@ def target_tasks_nightly_desktop(full_task_graph, parameters, graph_config): ) -# Opt DMD builds should only run nightly -@_target_task('nightly_dmd') -def target_tasks_dmd(full_task_graph, parameters, graph_config): - """Target DMD that run nightly on the m-c branch.""" - def filter(task): - platform = task.attributes.get('build_platform', '') - return platform.endswith('-dmd') - return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)] - - # Run Searchfox analysis once daily. @_target_task('searchfox_index') def target_tasks_searchfox(full_task_graph, parameters, graph_config): diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 132d7e124364..6a30e1ba33f5 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -390,7 +390,6 @@ class BuildOptionParser(object): 'artifact': 'builds/releng_sub_%s_configs/%s_artifact.py', 'debug-artifact': 'builds/releng_sub_%s_configs/%s_debug_artifact.py', 'devedition': 'builds/releng_sub_%s_configs/%s_devedition.py', - 'dmd': 'builds/releng_sub_%s_configs/%s_dmd.py', 'tup': 'builds/releng_sub_%s_configs/%s_tup.py', } build_pool_cfg_file = 'builds/build_pool_specifics.py'