Merge branch 'fix/ocamlgraph-ci-for-release' into feature/fix-snark-e…

…rror
MinaProtocol · Sep 18, 2020 · 6d25475 · 6d25475
2 parents fb80053 + 960581d
commit 6d25475
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 42 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -104,8 +104,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -172,8 +175,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - save_cache:
                 name: Save cache - opam
@@ -229,8 +235,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                   name: Check circle CI configuration rendering
@@ -283,8 +292,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                   name: Compare versioned types in PR
@@ -323,8 +335,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                   name: Compare test signatures for consensus, nonconsensus code
@@ -554,8 +569,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                   name: Build client SDK for Javascript
@@ -601,8 +619,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -764,8 +785,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -811,8 +835,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -856,8 +883,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -901,8 +931,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1151,8 +1184,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1190,8 +1226,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1229,8 +1268,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1271,8 +1313,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1310,8 +1355,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1349,8 +1397,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1388,8 +1439,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1432,8 +1486,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper
@@ -1474,8 +1531,11 @@ jobs:
                 keys:
                     - opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 
             - run:
                 name: Build libp2p_helper

diff --git a/.circleci/config.yml.jinja b/.circleci/config.yml.jinja
@@ -20,8 +20,11 @@
                 keys:
                     - opam-linux-v1-{{'{{'}} checksum "opam_ci_cache.sig" {{'}}'}}
             - run:
-                name: Install opam dependencies - opam -- LIBP2P_NIXLESS=1 make setup-opam
-                command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
+                name: Install opam dependencies - opam -- make setup-opam
+                command: |
+                    # FIXME: Remove this when it becomes unnecessary
+                    sudo apt-get install -y autoconf
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'LIBP2P_NIXLESS=1 make setup-opam'
 {%endset%}
 
 {% set checkout_no_lfs %}

diff --git a/scripts/setup-opam.sh b/scripts/setup-opam.sh
@@ -41,6 +41,10 @@ else
   opam switch $SWITCH
 fi
 
+# FIXME: Manually pin ocamlgraph while their hosting is down
+opam install conf-autoconf # This is needed because the ocamlgraph opam file is lacking..
+opam pin ocamlgraph https://github.com/backtracking/ocamlgraph/archive/v1.8.8.tar.gz
+
 # All our ocaml packages
 opam switch import src/opam.export
 eval $(opam config env)