Merge branch 'develop' into feature/buildkite-ci-scaffold

MinaProtocol · Apr 30, 2020 · 9b6ce4c · 9b6ce4c
2 parents ed84f6a + 474078b
commit 9b6ce4c
Show file tree

Hide file tree

Showing 29 changed files with 198 additions and 207 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -52,7 +52,7 @@ jobs:
     test-archive:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
               environment:
                 CODA_DOCKER: true
             - image: postgres:12
@@ -83,7 +83,7 @@ jobs:
     build-archive:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
               environment:
                 CODA_DOCKER: true
                 HASURA_PORT: 8080
@@ -129,7 +129,7 @@ jobs:
                   command: ./scripts/archive/build-release-archives.sh
     lint:
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -158,7 +158,7 @@ jobs:
                   command: ./scripts/require-ppx-coda.py
     lint-opt:
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -178,7 +178,7 @@ jobs:
                   command: ./scripts/compare_ci_diff_binables.sh
     compare-test-signatures:
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -343,7 +343,7 @@ jobs:
     build-client-sdk:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -365,7 +365,7 @@ jobs:
     build-artifacts--testnet_postake_medium_curves:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -462,7 +462,7 @@ jobs:
     test-unit--dev:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run: ulimit -c unlimited
@@ -487,7 +487,7 @@ jobs:
     test-unit--nonconsensus_medium_curves:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run: ulimit -c unlimited
@@ -510,7 +510,7 @@ jobs:
     test-unit--dev_medium_curves:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run: ulimit -c unlimited
@@ -533,7 +533,7 @@ jobs:
     test--fake_hash:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -550,7 +550,7 @@ jobs:
     test--test_postake:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -570,7 +570,7 @@ jobs:
     test--test_postake_bootstrap:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -590,7 +590,7 @@ jobs:
     test--test_postake_catchup:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -607,7 +607,7 @@ jobs:
     test--test_postake_delegation:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -624,7 +624,7 @@ jobs:
     test--test_postake_five_even_txns:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -641,7 +641,7 @@ jobs:
     test--test_postake_snarkless:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -661,7 +661,7 @@ jobs:
     test--test_postake_split:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -678,7 +678,7 @@ jobs:
     test--test_postake_split_snarkless:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -713,7 +713,7 @@ jobs:
     test--test_postake_three_producers:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -730,7 +730,7 @@ jobs:
     test--test_postake_txns:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -750,7 +750,7 @@ jobs:
     test--test_postake_full_epoch:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -767,7 +767,7 @@ jobs:
     test--test_postake_medium_curves:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -789,7 +789,7 @@ jobs:
     test--test_postake_snarkless_medium_curves:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -809,7 +809,7 @@ jobs:
     test--test_postake_split_medium_curves:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:

diff --git a/.circleci/config.yml.jinja b/.circleci/config.yml.jinja
@@ -52,7 +52,7 @@ jobs:
     test-archive:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
               environment:
                 CODA_DOCKER: true
             - image: postgres:12
@@ -83,7 +83,7 @@ jobs:
     build-archive:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
               environment:
                 CODA_DOCKER: true
                 HASURA_PORT: 8080
@@ -129,7 +129,7 @@ jobs:
                   command: ./scripts/archive/build-release-archives.sh
     lint:
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -158,7 +158,7 @@ jobs:
                   command: ./scripts/require-ppx-coda.py
     lint-opt:
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -178,7 +178,7 @@ jobs:
                   command: ./scripts/compare_ci_diff_binables.sh
     compare-test-signatures:
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -343,7 +343,7 @@ jobs:
     build-client-sdk:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -367,7 +367,7 @@ jobs:
     build-artifacts--{{profile}}:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -469,7 +469,7 @@ jobs:
     test-unit--{{profile}}:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run: ulimit -c unlimited
@@ -495,7 +495,7 @@ jobs:
     test-unit--nonconsensus_medium_curves:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run: ulimit -c unlimited
@@ -520,7 +520,7 @@ jobs:
     test-unit--{{profile}}:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run: ulimit -c unlimited
@@ -546,7 +546,7 @@ jobs:
     test--{{profile}}:
         resource_class: large
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:
@@ -568,7 +568,7 @@ jobs:
     test--{{profile}}:
         resource_class: xlarge
         docker:
-            - image: codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+            - image: codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
         steps:
             - checkout
             - run:

diff --git a/README-dev.md b/README-dev.md
@@ -59,7 +59,7 @@ of the repo.
 
 * Pull down developer container image  (~2GB download, go stretch your legs)
 
-`docker pull codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab`
+`docker pull codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf`
 
 * Create local builder image
 

diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
@@ -1,4 +1,4 @@
-FROM codaprotocol/coda:toolchain-9396e1d959f824275c4a433ba1065bcb4e8a30ab
+FROM codaprotocol/coda:toolchain-39f69e81b5fd8cc0f509631823a17155b63990cf
 
 # same as in Dockerfile-toolchain
 ARG OCAML_VERSION=4.07.1

diff --git a/dockerfiles/Dockerfile-toolchain b/dockerfiles/Dockerfile-toolchain
@@ -38,11 +38,14 @@ RUN sudo apt-get update && sudo apt-get install --yes \
     pkg-config \
     python-jinja2 \
     python-pip \
+    python3-pip \
     rubygems \
     zlib1g-dev \
     libbz2-dev
 
-RUN sudo pip install sexpdata awscli readchar
+RUN sudo pip install awscli readchar
+
+RUN sudo pip3 install sexpdata
 
 RUN sudo gem install deb-s3