# HG changeset patch # User John W. Eaton # Date 1598011981 0 # Node ID 0e1fc3eea4d059de2115c0fd6c18681641146692 # Parent f2bc3b63341497e564113e164162faf7bf7a1d00 new build configs; adjust load; move w64-64 to different system diff -r f2bc3b633414 -r 0e1fc3eea4d0 master.cfg --- a/master.cfg Fri Jun 12 13:47:53 2020 +0000 +++ b/master.cfg Fri Aug 21 12:13:01 2020 +0000 @@ -110,39 +110,45 @@ #all_default_octave_builders.append ("gcc-4.9-debian") #all_default_octave_builders.append ("gcc-5-debian") all_default_octave_builders.append ("gcc-6-debian") # mtmx -all_default_octave_builders.append ("gcc-7-debian") # jwe 2 -all_default_octave_builders.append ("gcc-7-lto-debian") # jwe 3 +all_default_octave_builders.append ("gcc-7-debian") # jwe 3 +all_default_octave_builders.append ("gcc-7-lto-debian") # jwe 2 +all_default_octave_builders.append ("gcc-debian") # jwe 3 +all_default_octave_builders.append ("gcc-lto-debian") # jwe 2 all_default_octave_builders.append ("gcc-fedora") # das all_default_octave_builders.append ("gcc-lto-fedora") # das all_default_octave_builders.append ("no-extras-debian") # jwe 2 all_default_octave_builders.append ("clang-3.9-debian") # mtmx all_default_octave_builders.append ("clang-4.0-debian") # jwe 1 all_default_octave_builders.append ("clang-5.0-debian") # jwe 0 +all_default_octave_builders.append ("clang-debian") # jwe 0 all_default_octave_builders.append ("clang-fedora") # das all_default_octave_builders.append ("clang-osx") # simone all_stable_octave_builders = []; -all_stable_octave_builders.append ("stable-gcc-7-debian") # jwe 2 -all_stable_octave_builders.append ("stable-gcc-7-lto-debian") # jwe 3 +all_stable_octave_builders.append ("stable-gcc-7-debian") # jwe 3 +all_stable_octave_builders.append ("stable-gcc-7-lto-debian") # jwe 2 +all_stable_octave_builders.append ("stable-gcc-debian") # jwe 3 +all_stable_octave_builders.append ("stable-gcc-lto-debian") # jwe 2 all_stable_octave_builders.append ("stable-gcc-fedora") # das all_stable_octave_builders.append ("stable-no-extras-debian") # jwe 2 all_stable_octave_builders.append ("stable-clang-4.0-debian") # jwe 1 all_stable_octave_builders.append ("stable-clang-5.0-debian") # jwe 0 +all_stable_octave_builders.append ("stable-clang-debian") # jwe 0 all_stable_octave_builders.append ("stable-clang-fedora") # das all_stable_octave_builders.append ("stable-clang-osx") # simone all_mxe_octave_builders = []; all_mxe_octave_builders.append ("w32-on-debian") # jwe 0 all_mxe_octave_builders.append ("w64-32-on-debian") # jwe 1 -all_mxe_octave_builders.append ("w64-64-on-debian") # jwe 3 +all_mxe_octave_builders.append ("w64-64-on-debian") # jwe 2 all_mxe_octave_builders.append ("w32-release-on-debian") # jwe 0 all_mxe_octave_builders.append ("w64-32-release-on-debian") # jwe 1 -all_mxe_octave_builders.append ("w64-64-release-on-debian") # jwe 3 +all_mxe_octave_builders.append ("w64-64-release-on-debian") # jwe 2 all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe 0 all_mxe_octave_builders.append ("w64-32-stable-on-debian") # jwe 1 -all_mxe_octave_builders.append ("w64-64-stable-on-debian") # jwe 3 +all_mxe_octave_builders.append ("w64-64-stable-on-debian") # jwe 2 all_mxe_octave_builders.append ("mxe-native-on-debian") # jwe 1 -all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe 3 +all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe 2 c["schedulers"] = [] @@ -567,20 +573,36 @@ factory = mk_gcc_6_factory (10, "-j2", "default"))) c["builders"].append (BuilderConfig (name = "gcc-7-debian", - workernames = ["jwe-debian-x86_64-2"], + workernames = ["jwe-debian-x86_64-3"], factory = mk_gcc_7_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "stable-gcc-7-debian", - workernames = ["jwe-debian-x86_64-2"], + workernames = ["jwe-debian-x86_64-3"], factory = mk_gcc_7_factory (19, "-j8", "stable"))) c["builders"].append (BuilderConfig (name = "gcc-7-lto-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_gcc_7_lto_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "stable-gcc-7-lto-debian", + workernames = ["jwe-debian-x86_64-2"], + factory = mk_gcc_7_lto_factory (19, "-j8", "stable"))) + +c["builders"].append (BuilderConfig (name = "gcc-debian", workernames = ["jwe-debian-x86_64-3"], - factory = mk_gcc_7_lto_factory (19, "-j8", "stable"))) + factory = mk_gcc_factory (19, "-j8", "default"))) + +c["builders"].append (BuilderConfig (name = "stable-gcc-debian", + workernames = ["jwe-debian-x86_64-3"], + factory = mk_gcc_factory (19, "-j8", "stable"))) + +c["builders"].append (BuilderConfig (name = "gcc-lto-debian", + workernames = ["jwe-debian-x86_64-2"], + factory = mk_gcc_lto_factory (19, "-j8", "default"))) + +c["builders"].append (BuilderConfig (name = "stable-gcc-lto-debian", + workernames = ["jwe-debian-x86_64-2"], + factory = mk_gcc_lto_factory (19, "-j8", "stable"))) c["builders"].append (BuilderConfig (name = "gcc-fedora", workernames = ["das_fc25-x86_64"], @@ -620,11 +642,19 @@ c["builders"].append (BuilderConfig (name = "clang-5.0-debian", workernames = ["jwe-debian-x86_64-0"], - factory = mk_clang_5_0_factory (19, "-j8", "default"))) + factory = mk_clang_5_0_factory (19, "-j6", "default"))) c["builders"].append (BuilderConfig (name = "stable-clang-5.0-debian", workernames = ["jwe-debian-x86_64-0"], - factory = mk_clang_5_0_factory (19, "-j8", "stable"))) + factory = mk_clang_5_0_factory (19, "-j6", "stable"))) + +c["builders"].append (BuilderConfig (name = "clang-debian", + workernames = ["jwe-debian-x86_64-0"], + factory = mk_clang_factory (19, "-j6", "default"))) + +c["builders"].append (BuilderConfig (name = "stable-clang-debian", + workernames = ["jwe-debian-x86_64-0"], + factory = mk_clang_factory (19, "-j6", "stable"))) c["builders"].append (BuilderConfig (name = "clang-fedora", workernames = ["das_fc25-x86_64"], @@ -793,7 +823,7 @@ c["builders"].append (BuilderConfig (name = "w32-on-debian", workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 8, "default", + factory = mk_w32_factory (19, 6, "default", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-on-debian", @@ -802,13 +832,13 @@ ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-on-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_w64_64_factory (19, 8, "default", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-release-on-debian", workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 8, "release", + factory = mk_w32_factory (19, 6, "release", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", @@ -817,14 +847,14 @@ ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_w64_64_factory (19, 8, "release", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 8, "stable", + factory = mk_w32_factory (19, 6, "stable", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", @@ -833,7 +863,7 @@ ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_w64_64_factory (19, 8, "stable", ["nsis-installer", "7z-dist"]))) @@ -842,7 +872,7 @@ factory = mk_native_factory (19, 8, "default", "tar-dist"))) c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_native_all_factory (19, 8, "default", "tar-dist")))