install-other-deps should install everything except F*

.docker/build/build-hierarchic.sh

@@ -9,9 +9,7 @@ branchname=$2
 
 build_home="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 . "$build_home"/build_funs.sh
-. "$build_home"/install-krml-funs.sh
-. "$build_home"/install-steel-funs.sh
-
+gi
 # Clear EVERPARSE_HOME, which was set by F*'s build
 unset EVERPARSE_HOME
 sed -i -E "s|^EVERPARSE_HOME=.*||" ~/.bashrc

.docker/build/build-standalone.sh

@@ -10,18 +10,6 @@ branchname=$2
 build_home="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 . "$build_home"/build_funs.sh
 
-function fetch_and_make_karamel() {
-    # Karamel is already supposed to have been built and fetched before
-    # (e.g. by install-deps.sh)
-    true
-}
-
-function fetch_and_make_steel() {
-    # steel is already supposed to have been built and fetched before
-    # (e.g. by install-deps.sh)
-    true
-}
-
 rootPath=$(pwd)
 result_file="result.txt"
 status_file="status.txt"

.docker/build/build_funs.sh

@@ -61,7 +61,6 @@ function rebuild_doc () {
 }
 
 function test_mitls_parsers () {
-        fetch_and_make_karamel &&
         OTHERFLAGS='--admit_smt_queries true' make -j $threads quackyducky lowparse &&
         export_home EVERPARSE "$(pwd)" &&
         fetch_mitls &&
@@ -80,8 +79,6 @@ function build_and_test_quackyducky() {
     # Rebuild the EverParse documentation and push it to project-everest.github.io
     rebuild_doc &&
     # Test EverParse proper
-    fetch_and_make_karamel &&
-    fetch_and_make_steel &&
     make -j $threads -k ci &&
     # Build incrementality test
     pushd tests/sample && {

.docker/build/install-deps.sh

@@ -19,28 +19,5 @@ git clone --branch $FSTAR_BRANCH https://github.com/FStarLang/FStar "$FSTAR_HOME
 opam install --deps-only "$FSTAR_HOME/fstar.opam"
 OTHERFLAGS='--admit_smt_queries true' make -j 24 -C "$FSTAR_HOME"
 
-# Identify the Karamel branch
-if [[ -z "$KRML_BRANCH" ]] ; then
-KRML_BRANCH=$(jq -c -r '.RepoVersions.karamel_version' "$build_home"/config.json | sed 's!^origin/!!')
-fi
-
-# Install Karamel and its dependencies
-[[ -n "$KRML_HOME" ]]
-git clone --branch $KRML_BRANCH https://github.com/FStarLang/karamel "$KRML_HOME"
-pushd $KRML_HOME
-.docker/build/install-other-deps.sh
-popd
-OTHERFLAGS='--admit_smt_queries true' make -j 24 -C "$KRML_HOME"
-
-# Identify the Steel branch
-if [[ -z "$STEEL_BRANCH" ]] ; then
-STEEL_BRANCH=$(jq -c -r '.RepoVersions.steel_version' "$build_home"/config.json | sed 's!^origin/!!')
-fi
-
-# Install Steel and its dependencies
-[[ -n "$STEEL_HOME" ]]
-git clone --branch $STEEL_BRANCH https://github.com/FStarLang/steel "$STEEL_HOME"
-OTHERFLAGS='--admit_smt_queries true' make -j 24 -C "$STEEL_HOME"
-
 # Install other EverParse deps
 "$build_home"/install-other-deps.sh

.docker/build/install-other-deps.sh

@@ -3,4 +3,27 @@
 set -e
 set -x
 
+# Identify the Karamel branch
+if [[ -z "$KRML_BRANCH" ]] ; then
+KRML_BRANCH=$(jq -c -r '.RepoVersions.karamel_version' "$build_home"/config.json | sed 's!^origin/!!')
+fi
+
+# Install Karamel and its dependencies
+[[ -n "$KRML_HOME" ]]
+git clone --branch $KRML_BRANCH https://github.com/FStarLang/karamel "$KRML_HOME"
+pushd $KRML_HOME
+.docker/build/install-other-deps.sh
+popd
+OTHERFLAGS='--admit_smt_queries true' make -j 24 -C "$KRML_HOME"
+
+# Identify the Steel branch
+if [[ -z "$STEEL_BRANCH" ]] ; then
+STEEL_BRANCH=$(jq -c -r '.RepoVersions.steel_version' "$build_home"/config.json | sed 's!^origin/!!')
+fi
+
+# Install Steel and its dependencies
+[[ -n "$STEEL_HOME" ]]
+git clone --branch $STEEL_BRANCH https://github.com/FStarLang/steel "$STEEL_HOME"
+OTHERFLAGS='--admit_smt_queries true' make -j 24 -C "$STEEL_HOME"
+
 opam install hex re ctypes sha