Move minimum build into Jenkins other-configs

3 files changed, 28 insertions, 59 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f6fc4756fe..904e4cadf9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -69,23 +69,3 @@ jobs:
     - name: Other checks
       run: |
         MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh other-checks
-  minimum:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: configure tree
-      run: |
-        XARCH=x64 MIN_BUILD=1 bash -xe tools/ci/actions/runner.sh configure
-    - name: Build
-      run: |
-        MIN_BUILD=1 bash -xe tools/ci/actions/runner.sh build
-    - name: Run the testsuite
-      run: |
-        MIN_BUILD=1 bash -xe tools/ci/actions/runner.sh test
-    - name: Install
-      run: |
-        MIN_BUILD=1 bash -xe tools/ci/actions/runner.sh install
-    - name: Other checks
-      run: |
-        MIN_BUILD=1 bash -xe tools/ci/actions/runner.sh other-checks
diff --git a/tools/ci/actions/runner.sh b/tools/ci/actions/runner.sh
index b38890231d..9fcc61691c 100755
--- a/tools/ci/actions/runner.sh
+++ b/tools/ci/actions/runner.sh
@@ -36,29 +36,13 @@ request can be merged.
 ------------------------------------------------------------------------
 EOF
 
-  if [ "$MIN_BUILD" = "1" ] ; then
-    configure_flags="\
-      --prefix=$PREFIX \
-      --disable-shared \
-      --disable-debug-runtime \
-      --disable-instrumented-runtime \
-      --disable-systhreads \
-      --disable-str-lib \
-      --disable-unix-lib \
-      --disable-bigarray-lib \
-      --disable-ocamldoc \
-      --disable-native-compiler \
-      --enable-ocamltest \
-      --disable-dependency-generation \
-      $CONFIG_ARG"
-  else
-    configure_flags="\
-      --prefix=$PREFIX \
-      --enable-flambda-invariants \
-      --enable-ocamltest \
-      --disable-dependency-generation \
-      $CONFIG_ARG"
-  fi
+  configure_flags="\
+    --prefix=$PREFIX \
+    --enable-flambda-invariants \
+    --enable-ocamltest \
+    --disable-dependency-generation \
+    $CONFIG_ARG"
+
   case $XARCH in
   x64)
     ./configure $configure_flags
@@ -77,17 +61,8 @@ EOF
 }
 
 Build () {
-  if [ "$MIN_BUILD" = "1" ] ; then
-    if $MAKE world.opt ; then
-      echo "world.opt is not supposed to work!"
-      exit 1
-    else
-      $MAKE world
-    fi
-  else
-    $MAKE world.opt
-    $MAKE ocamlnat
-  fi
+  $MAKE world.opt
+  $MAKE ocamlnat
   echo Ensuring that all names are prefixed in the runtime
   ./tools/check-symbol-names runtime/*.a
 }
@@ -96,10 +71,8 @@ Test () {
   cd testsuite
   echo Running the testsuite with the normal runtime
   $MAKE all
-  if [ "$MIN_BUILD" != "1" ] ; then
-    echo Running the testsuite with the debug runtime
-    $MAKE USE_RUNTIME='d' OCAMLTESTDIR="$(pwd)/_ocamltestd" TESTLOG=_logd all
-  fi
+  echo Running the testsuite with the debug runtime
+  $MAKE USE_RUNTIME='d' OCAMLTESTDIR="$(pwd)/_ocamltestd" TESTLOG=_logd all
   cd ..
 }
 
diff --git a/tools/ci/inria/other-configs/script b/tools/ci/inria/other-configs/script
index 09fe675b1f..c3279f63cf 100755
--- a/tools/ci/inria/other-configs/script
+++ b/tools/ci/inria/other-configs/script
@@ -22,7 +22,23 @@ set -e
 mainjob=./tools/ci/inria/main
 main="${mainjob} -j8"
 
-${main} -conf --disable-native-compiler -no-native
+# The "MIN_BUILD" (formerly on Travis) builds with everything disabled (apart
+# from ocamltest). Its goals:
+#  - Ensure that the system builds correctly without native compilation
+#  - Ensure ocamltest builds correctly with Unix
+#  - Ensure the testsuite runs correctly with everything switched off
+${main} -conf --disable-native-compiler \
+        -conf --disable-shared \
+        -conf --disable-debug-runtime \
+        -conf --disable-instrumented-runtime \
+        -conf --disable-systhreads \
+        -conf --disable-str-lib \
+        -conf --disable-unix-lib \
+        -conf --disable-bigarray-lib \
+        -conf --disable-ocamldoc \
+        -conf --disable-native-compiler \
+        -conf --disable-dependency-generation \
+        -no-native
 ${main} -conf --disable-naked-pointers
 ${main} -with-bootstrap -conf --disable-flat-float-array
 ${main} -conf --enable-flambda -conf --disable-naked-pointers