comparison master.cfg @ 23:0e1fc3eea4d0

new build configs; adjust load; move w64-64 to different system
author John W. Eaton <jwe@octave.org>
date Fri, 21 Aug 2020 12:13:01 +0000
parents f2bc3b633414
children 362fc8cd6712
comparison
equal deleted inserted replaced
22:f2bc3b633414 23:0e1fc3eea4d0
108 108
109 all_default_octave_builders = []; 109 all_default_octave_builders = [];
110 #all_default_octave_builders.append ("gcc-4.9-debian") 110 #all_default_octave_builders.append ("gcc-4.9-debian")
111 #all_default_octave_builders.append ("gcc-5-debian") 111 #all_default_octave_builders.append ("gcc-5-debian")
112 all_default_octave_builders.append ("gcc-6-debian") # mtmx 112 all_default_octave_builders.append ("gcc-6-debian") # mtmx
113 all_default_octave_builders.append ("gcc-7-debian") # jwe 2 113 all_default_octave_builders.append ("gcc-7-debian") # jwe 3
114 all_default_octave_builders.append ("gcc-7-lto-debian") # jwe 3 114 all_default_octave_builders.append ("gcc-7-lto-debian") # jwe 2
115 all_default_octave_builders.append ("gcc-debian") # jwe 3
116 all_default_octave_builders.append ("gcc-lto-debian") # jwe 2
115 all_default_octave_builders.append ("gcc-fedora") # das 117 all_default_octave_builders.append ("gcc-fedora") # das
116 all_default_octave_builders.append ("gcc-lto-fedora") # das 118 all_default_octave_builders.append ("gcc-lto-fedora") # das
117 all_default_octave_builders.append ("no-extras-debian") # jwe 2 119 all_default_octave_builders.append ("no-extras-debian") # jwe 2
118 all_default_octave_builders.append ("clang-3.9-debian") # mtmx 120 all_default_octave_builders.append ("clang-3.9-debian") # mtmx
119 all_default_octave_builders.append ("clang-4.0-debian") # jwe 1 121 all_default_octave_builders.append ("clang-4.0-debian") # jwe 1
120 all_default_octave_builders.append ("clang-5.0-debian") # jwe 0 122 all_default_octave_builders.append ("clang-5.0-debian") # jwe 0
123 all_default_octave_builders.append ("clang-debian") # jwe 0
121 all_default_octave_builders.append ("clang-fedora") # das 124 all_default_octave_builders.append ("clang-fedora") # das
122 all_default_octave_builders.append ("clang-osx") # simone 125 all_default_octave_builders.append ("clang-osx") # simone
123 126
124 all_stable_octave_builders = []; 127 all_stable_octave_builders = [];
125 all_stable_octave_builders.append ("stable-gcc-7-debian") # jwe 2 128 all_stable_octave_builders.append ("stable-gcc-7-debian") # jwe 3
126 all_stable_octave_builders.append ("stable-gcc-7-lto-debian") # jwe 3 129 all_stable_octave_builders.append ("stable-gcc-7-lto-debian") # jwe 2
130 all_stable_octave_builders.append ("stable-gcc-debian") # jwe 3
131 all_stable_octave_builders.append ("stable-gcc-lto-debian") # jwe 2
127 all_stable_octave_builders.append ("stable-gcc-fedora") # das 132 all_stable_octave_builders.append ("stable-gcc-fedora") # das
128 all_stable_octave_builders.append ("stable-no-extras-debian") # jwe 2 133 all_stable_octave_builders.append ("stable-no-extras-debian") # jwe 2
129 all_stable_octave_builders.append ("stable-clang-4.0-debian") # jwe 1 134 all_stable_octave_builders.append ("stable-clang-4.0-debian") # jwe 1
130 all_stable_octave_builders.append ("stable-clang-5.0-debian") # jwe 0 135 all_stable_octave_builders.append ("stable-clang-5.0-debian") # jwe 0
136 all_stable_octave_builders.append ("stable-clang-debian") # jwe 0
131 all_stable_octave_builders.append ("stable-clang-fedora") # das 137 all_stable_octave_builders.append ("stable-clang-fedora") # das
132 all_stable_octave_builders.append ("stable-clang-osx") # simone 138 all_stable_octave_builders.append ("stable-clang-osx") # simone
133 139
134 all_mxe_octave_builders = []; 140 all_mxe_octave_builders = [];
135 all_mxe_octave_builders.append ("w32-on-debian") # jwe 0 141 all_mxe_octave_builders.append ("w32-on-debian") # jwe 0
136 all_mxe_octave_builders.append ("w64-32-on-debian") # jwe 1 142 all_mxe_octave_builders.append ("w64-32-on-debian") # jwe 1
137 all_mxe_octave_builders.append ("w64-64-on-debian") # jwe 3 143 all_mxe_octave_builders.append ("w64-64-on-debian") # jwe 2
138 all_mxe_octave_builders.append ("w32-release-on-debian") # jwe 0 144 all_mxe_octave_builders.append ("w32-release-on-debian") # jwe 0
139 all_mxe_octave_builders.append ("w64-32-release-on-debian") # jwe 1 145 all_mxe_octave_builders.append ("w64-32-release-on-debian") # jwe 1
140 all_mxe_octave_builders.append ("w64-64-release-on-debian") # jwe 3 146 all_mxe_octave_builders.append ("w64-64-release-on-debian") # jwe 2
141 all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe 0 147 all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe 0
142 all_mxe_octave_builders.append ("w64-32-stable-on-debian") # jwe 1 148 all_mxe_octave_builders.append ("w64-32-stable-on-debian") # jwe 1
143 all_mxe_octave_builders.append ("w64-64-stable-on-debian") # jwe 3 149 all_mxe_octave_builders.append ("w64-64-stable-on-debian") # jwe 2
144 all_mxe_octave_builders.append ("mxe-native-on-debian") # jwe 1 150 all_mxe_octave_builders.append ("mxe-native-on-debian") # jwe 1
145 all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe 3 151 all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe 2
146 152
147 c["schedulers"] = [] 153 c["schedulers"] = []
148 154
149 c["schedulers"].append (SingleBranchScheduler (name = "default octave", 155 c["schedulers"].append (SingleBranchScheduler (name = "default octave",
150 change_filter = octave_default_filter, 156 change_filter = octave_default_filter,
565 c["builders"].append (BuilderConfig (name = "gcc-6-debian", 571 c["builders"].append (BuilderConfig (name = "gcc-6-debian",
566 workernames = ["mtmx-debian-x86_64"], 572 workernames = ["mtmx-debian-x86_64"],
567 factory = mk_gcc_6_factory (10, "-j2", "default"))) 573 factory = mk_gcc_6_factory (10, "-j2", "default")))
568 574
569 c["builders"].append (BuilderConfig (name = "gcc-7-debian", 575 c["builders"].append (BuilderConfig (name = "gcc-7-debian",
576 workernames = ["jwe-debian-x86_64-3"],
577 factory = mk_gcc_7_factory (19, "-j8", "default")))
578
579 c["builders"].append (BuilderConfig (name = "stable-gcc-7-debian",
580 workernames = ["jwe-debian-x86_64-3"],
581 factory = mk_gcc_7_factory (19, "-j8", "stable")))
582
583 c["builders"].append (BuilderConfig (name = "gcc-7-lto-debian",
570 workernames = ["jwe-debian-x86_64-2"], 584 workernames = ["jwe-debian-x86_64-2"],
571 factory = mk_gcc_7_factory (19, "-j8", "default"))) 585 factory = mk_gcc_7_lto_factory (19, "-j8", "default")))
572 586
573 c["builders"].append (BuilderConfig (name = "stable-gcc-7-debian", 587 c["builders"].append (BuilderConfig (name = "stable-gcc-7-lto-debian",
574 workernames = ["jwe-debian-x86_64-2"], 588 workernames = ["jwe-debian-x86_64-2"],
575 factory = mk_gcc_7_factory (19, "-j8", "stable"))) 589 factory = mk_gcc_7_lto_factory (19, "-j8", "stable")))
576 590
577 c["builders"].append (BuilderConfig (name = "gcc-7-lto-debian", 591 c["builders"].append (BuilderConfig (name = "gcc-debian",
578 workernames = ["jwe-debian-x86_64-3"], 592 workernames = ["jwe-debian-x86_64-3"],
579 factory = mk_gcc_7_lto_factory (19, "-j8", "default"))) 593 factory = mk_gcc_factory (19, "-j8", "default")))
580 594
581 c["builders"].append (BuilderConfig (name = "stable-gcc-7-lto-debian", 595 c["builders"].append (BuilderConfig (name = "stable-gcc-debian",
582 workernames = ["jwe-debian-x86_64-3"], 596 workernames = ["jwe-debian-x86_64-3"],
583 factory = mk_gcc_7_lto_factory (19, "-j8", "stable"))) 597 factory = mk_gcc_factory (19, "-j8", "stable")))
598
599 c["builders"].append (BuilderConfig (name = "gcc-lto-debian",
600 workernames = ["jwe-debian-x86_64-2"],
601 factory = mk_gcc_lto_factory (19, "-j8", "default")))
602
603 c["builders"].append (BuilderConfig (name = "stable-gcc-lto-debian",
604 workernames = ["jwe-debian-x86_64-2"],
605 factory = mk_gcc_lto_factory (19, "-j8", "stable")))
584 606
585 c["builders"].append (BuilderConfig (name = "gcc-fedora", 607 c["builders"].append (BuilderConfig (name = "gcc-fedora",
586 workernames = ["das_fc25-x86_64"], 608 workernames = ["das_fc25-x86_64"],
587 factory = mk_gcc_factory (0, "-j4", "default"))) 609 factory = mk_gcc_factory (0, "-j4", "default")))
588 610
618 workernames = ["jwe-debian-x86_64-1"], 640 workernames = ["jwe-debian-x86_64-1"],
619 factory = mk_clang_4_0_factory (19, "-j8", "stable"))) 641 factory = mk_clang_4_0_factory (19, "-j8", "stable")))
620 642
621 c["builders"].append (BuilderConfig (name = "clang-5.0-debian", 643 c["builders"].append (BuilderConfig (name = "clang-5.0-debian",
622 workernames = ["jwe-debian-x86_64-0"], 644 workernames = ["jwe-debian-x86_64-0"],
623 factory = mk_clang_5_0_factory (19, "-j8", "default"))) 645 factory = mk_clang_5_0_factory (19, "-j6", "default")))
624 646
625 c["builders"].append (BuilderConfig (name = "stable-clang-5.0-debian", 647 c["builders"].append (BuilderConfig (name = "stable-clang-5.0-debian",
626 workernames = ["jwe-debian-x86_64-0"], 648 workernames = ["jwe-debian-x86_64-0"],
627 factory = mk_clang_5_0_factory (19, "-j8", "stable"))) 649 factory = mk_clang_5_0_factory (19, "-j6", "stable")))
650
651 c["builders"].append (BuilderConfig (name = "clang-debian",
652 workernames = ["jwe-debian-x86_64-0"],
653 factory = mk_clang_factory (19, "-j6", "default")))
654
655 c["builders"].append (BuilderConfig (name = "stable-clang-debian",
656 workernames = ["jwe-debian-x86_64-0"],
657 factory = mk_clang_factory (19, "-j6", "stable")))
628 658
629 c["builders"].append (BuilderConfig (name = "clang-fedora", 659 c["builders"].append (BuilderConfig (name = "clang-fedora",
630 workernames = ["das_fc25-x86_64"], 660 workernames = ["das_fc25-x86_64"],
631 factory = mk_clang_factory (19, "-j4", "default"))) 661 factory = mk_clang_factory (19, "-j4", "default")))
632 662
791 compile_opts) 821 compile_opts)
792 822
793 823
794 c["builders"].append (BuilderConfig (name = "w32-on-debian", 824 c["builders"].append (BuilderConfig (name = "w32-on-debian",
795 workernames = ["jwe-debian-x86_64-0"], 825 workernames = ["jwe-debian-x86_64-0"],
796 factory = mk_w32_factory (19, 8, "default", 826 factory = mk_w32_factory (19, 6, "default",
797 ["nsis-installer", "7z-dist"]))) 827 ["nsis-installer", "7z-dist"])))
798 828
799 c["builders"].append (BuilderConfig (name = "w64-32-on-debian", 829 c["builders"].append (BuilderConfig (name = "w64-32-on-debian",
800 workernames = ["jwe-debian-x86_64-1"], 830 workernames = ["jwe-debian-x86_64-1"],
801 factory = mk_w64_32_factory (19, 8, "default", 831 factory = mk_w64_32_factory (19, 8, "default",
802 ["nsis-installer", "7z-dist"]))) 832 ["nsis-installer", "7z-dist"])))
803 833
804 c["builders"].append (BuilderConfig (name = "w64-64-on-debian", 834 c["builders"].append (BuilderConfig (name = "w64-64-on-debian",
805 workernames = ["jwe-debian-x86_64-3"], 835 workernames = ["jwe-debian-x86_64-2"],
806 factory = mk_w64_64_factory (19, 8, "default", 836 factory = mk_w64_64_factory (19, 8, "default",
807 ["nsis-installer", "7z-dist"]))) 837 ["nsis-installer", "7z-dist"])))
808 838
809 c["builders"].append (BuilderConfig (name = "w32-release-on-debian", 839 c["builders"].append (BuilderConfig (name = "w32-release-on-debian",
810 workernames = ["jwe-debian-x86_64-0"], 840 workernames = ["jwe-debian-x86_64-0"],
811 factory = mk_w32_factory (19, 8, "release", 841 factory = mk_w32_factory (19, 6, "release",
812 ["nsis-installer", "7z-dist"]))) 842 ["nsis-installer", "7z-dist"])))
813 843
814 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", 844 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian",
815 workernames = ["jwe-debian-x86_64-1"], 845 workernames = ["jwe-debian-x86_64-1"],
816 factory = mk_w64_32_factory (19, 8, "release", 846 factory = mk_w64_32_factory (19, 8, "release",
817 ["nsis-installer", "7z-dist"]))) 847 ["nsis-installer", "7z-dist"])))
818 848
819 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", 849 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian",
820 workernames = ["jwe-debian-x86_64-3"], 850 workernames = ["jwe-debian-x86_64-2"],
821 factory = mk_w64_64_factory (19, 8, "release", 851 factory = mk_w64_64_factory (19, 8, "release",
822 ["nsis-installer", "7z-dist"]))) 852 ["nsis-installer", "7z-dist"])))
823 853
824 854
825 c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", 855 c["builders"].append (BuilderConfig (name = "w32-stable-on-debian",
826 workernames = ["jwe-debian-x86_64-0"], 856 workernames = ["jwe-debian-x86_64-0"],
827 factory = mk_w32_factory (19, 8, "stable", 857 factory = mk_w32_factory (19, 6, "stable",
828 ["nsis-installer", "7z-dist"]))) 858 ["nsis-installer", "7z-dist"])))
829 859
830 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", 860 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian",
831 workernames = ["jwe-debian-x86_64-1"], 861 workernames = ["jwe-debian-x86_64-1"],
832 factory = mk_w64_32_factory (19, 8, "stable", 862 factory = mk_w64_32_factory (19, 8, "stable",
833 ["nsis-installer", "7z-dist"]))) 863 ["nsis-installer", "7z-dist"])))
834 864
835 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", 865 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian",
836 workernames = ["jwe-debian-x86_64-3"], 866 workernames = ["jwe-debian-x86_64-2"],
837 factory = mk_w64_64_factory (19, 8, "stable", 867 factory = mk_w64_64_factory (19, 8, "stable",
838 ["nsis-installer", "7z-dist"]))) 868 ["nsis-installer", "7z-dist"])))
839 869
840 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", 870 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian",
841 workernames = ["jwe-debian-x86_64-1"], 871 workernames = ["jwe-debian-x86_64-1"],
842 factory = mk_native_factory (19, 8, "default", "tar-dist"))) 872 factory = mk_native_factory (19, 8, "default", "tar-dist")))
843 873
844 c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian", 874 c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian",
845 workernames = ["jwe-debian-x86_64-3"], 875 workernames = ["jwe-debian-x86_64-2"],
846 factory = mk_native_all_factory (19, 8, "default", "tar-dist"))) 876 factory = mk_native_all_factory (19, 8, "default", "tar-dist")))
847 877
848 878
849 ## PROJECT IDENTITY 879 ## PROJECT IDENTITY
850 880