From 0a4dc2cc8679389ede7f3617edcab37b3a145880 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 8 Feb 2018 23:43:05 +0100
Subject: Split build and test emscripten

---
 circle.yml | 58 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 18 deletions(-)

(limited to 'circle.yml')

diff --git a/circle.yml b/circle.yml
index d1c8e35f..f2054384 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,21 +5,6 @@ jobs:
       - image: trzeci/emscripten:sdk-tag-1.37.21-64bit
     steps:
       - checkout
-      - run:
-          name: Install external tests deps
-          command: |
-            apt-get -qq update
-            apt-get -qy install netcat curl
-            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.4/install.sh | NVM_DIR=/usr/local/nvm bash
-      - run:
-          name: Test external tests deps
-          command: |
-            export NVM_DIR="/usr/local/nvm"
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-            nvm --version
-            nvm install 6
-            node --version
-            npm --version
       - run:
           name: Init submodules
           command: |
@@ -40,14 +25,45 @@ jobs:
           key: *boost-cache-key
           paths:
             - boost_1_57_0
+      - store_artifacts:
+          path: build/libsolc/soljson.js
+          destination: soljson.js
+      - run: mkdir -p workspace
+      - run: cp build/libsolc/soljson.js workspace/soljson.js
+      - persist_to_workspace:
+          root: workspace
+          paths:
+            - soljson.js
+  test_emscripten:
+    docker:
+      - image: trzeci/emscripten:sdk-tag-1.37.21-64bit
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/workspace
+      - run: mkdir -p build/libsolc/
+      - run: cp /tmp/workspace/soljson.js build/libsolc/soljson.js
+      - run: cp /tmp/workspace/soljson.js soljson.js
+      - run:
+          name: Install external tests deps
+          command: |
+            apt-get -qq update
+            apt-get -qy install netcat curl
+            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.4/install.sh | NVM_DIR=/usr/local/nvm bash
+      - run:
+          name: Test external tests deps
+          command: |
+            export NVM_DIR="/usr/local/nvm"
+            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+            nvm --version
+            nvm install 6
+            node --version
+            npm --version
       - run:
           name: Test
           command: |
             . /usr/local/nvm/nvm.sh
             scripts/test_emscripten.sh
-      - store_artifacts:
-          path: build/solc/soljson.js
-          destination: soljson.js
   build_x86:
     docker:
       - image: buildpack-deps:artful
@@ -90,10 +106,16 @@ jobs:
           command: build/test/soltest --logger=JUNIT,test_suite,test_results/opt.xml -- --optimize --no-ipc
       - store_test_results:
           path: test_results/
+      - store_artifacts:
+          path: build/solc/solc
+          destination: solc
 
 workflows:
   version: 2
   build_all:
     jobs:
       - build_emscripten
+      - test_emscripten:
+          requires:
+            - build_emscripten
       - build_x86
-- 
cgit