Always run optional steps if configured to run.

[buildfarm-client.git] / build-farm.conf.template

diff --git a/build-farm.conf.template b/build-farm.conf.template
index f1699920dd0e315249c4c9dea5b01d389458f4f4..8255bb34ffeb08f7fb54e079a813d045256525f9 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -26,7 +26,8 @@ my $branch;
 # This template assumes that the user running the buildfarm process is "farm"
 %conf =(
     scm => 'git',
-    scmrepo => 'git://git.exim.org/exim.git', # default is community repo for either type
+    # default is github mirror of Exim
+    scmrepo => 'https://github.com/Exim/exim.git',
     # Wishlist for future, track and build from multiple repos.
     # Doesn't do anything yet.
     repos => {
@@ -41,6 +42,8 @@ my $branch;
     # git_reference => undef,
     # or gmake if required. can include path if necessary.
     make => 'make',
+    # 1 = any make will do, 0 = require GNU (default)
+    non_gnu_make => 0,
     # >1 for parallel "make" and "make check" steps
     make_jobs => undef,
     # default is "tar -z -cf runlogs.tgz *.log"
@@ -130,7 +133,7 @@ my $branch;
     makefile_set =>{
         # comment out if not using ccache
         CC => 'ccache gcc',
-        # Other examples. Could use regex in config_features instead.
+        # Other examples. Could use makefile_regex instead.
         #SUPPORT_TLS => 'yes',
         #TLS_LIBS => '-lssl -lcrypto',
     },
@@ -147,8 +150,8 @@ my $branch;
 
     # Another way to enable things in the Local/Makefile.
     # Use a simple regex to change a default to what you want.
-    config_features=>[
-        q(s/^# EXPERIMENTAL_PRDR.*/EXPERIMENTAL_PRDR=yes/),
+    makefile_regex =>[
+        #q(s/^# EXPERIMENTAL_PRDR.*/EXPERIMENTAL_PRDR=yes/),
     ],
 
     # The user compiled as the master exim username.
@@ -166,14 +169,14 @@ my $branch;
 
     optional_steps =>{
         # which optional steps to run and when to run them
-        # build_docs => {min_hours_since => 24*7},
-        make_test  => {min_hours_since => 24*7},
+        # 'make-doc' => {min_hours_since => 24*7},
+        test  => {min_hours_since => 24*7},
     },
 
     # locales to test
     locales => [qw( C )],
 
-    # Unused
+    # Placemarker for auto-generated build features
     config_opts =>[
         qw()
     ],