Fix cold job

dra27 · Mar 26, 2023 · ee6e3a5 · ee6e3a5
1 parent e179ec0
commit ee6e3a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/scripts/main/main.sh b/.github/scripts/main/main.sh
@@ -32,7 +32,7 @@ if [ -e "$OCAML_LOCAL/_build" ]; then
   cp -a "$OCAML_LOCAL/_build" .
 fi
 
-./configure --prefix $CONFIGURE_PREFIX --with-mccs
+./configure --prefix $CONFIGURE_PREFIX --with-mccs $CONFIGURE_ARGS
 if [ "$OPAM_TEST" != "1" ]; then
   echo 'DUNE_PROFILE=dev' >> Makefile.config
 fi

diff --git a/.github/workflows/ci.ml b/.github/workflows/ci.ml
@@ -389,7 +389,7 @@ let cold_job ~analyse_job ~build_linux_job ~build_windows_job ~build_macOS_job ?
     ++ only_on Linux (run "Install bubblewrap" ["sudo apt install bubblewrap"])
     ++ checkout ()
     ++ cache Archives
-    ++ run "Cold" [
+    ++ run "Cold" ~env:[("CONFIGURE_ARS", "--without-vendored-deps")] [
          "make compiler";
          "make lib-pkg";
          "bash -exu .github/scripts/main/main.sh " ^ host]
@@ -475,6 +475,7 @@ let main oc : unit =
     ("CYGWIN_ROOT", "D:\\cygwin");
     ("CYGWIN", "winsymlinks:native");
     ("CYGWIN_EPOCH", "3");
+    ("CONFIGURE_ARGS", "");
   ] in
   let keys = [
     ("archives", "archives-1-${{ hashFiles('src_ext/Makefile.sources', 'src_ext/Makefile', '.github/scripts/common/preamble.sh', '.github/scripts/main/preamble.sh', '.github/scripts/main/archives-cache.sh') }}-${{ env.OPAM_REPO_SHA }}");

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -47,6 +47,7 @@ env:
   CYGWIN_ROOT: D:\cygwin
   CYGWIN: winsymlinks:native
   CYGWIN_EPOCH: 3
+  CONFIGURE_ARGS:
 
 defaults:
   run:
@@ -388,6 +389,8 @@ jobs:
         key: ${{ needs.Analyse.outputs.archives }}
         force-gzip: true
     - name: Cold
+      env:
+        CONFIGURE_ARGS: --without-vendored-deps
       run: |
         make compiler
         make lib-pkg