Revert "Merge pull request #75 from jcfr/circleci-parallel-build"

Waiting we address the timeout of command after 120min when using
parallel containers, this reverts commit e120e36824, reversing
changes made to 6a4826a8df.

Issue has been reported to CircleCI support as
https://circleci.zendesk.com/hc/en-us/requests/13273

circle.yml

@@ -12,22 +12,54 @@ dependencies:
 
   override:
     - docker info
-    - curl -fsSL https://git.io/v2Ifs -o ~/bin/circleci-matrix
-    - chmod +x ~/bin/circleci-matrix
+    - if [[ -e ~/docker/base.tar ]]; then docker load -i ~/docker/base.tar; fi
+    - docker pull dockcross/base
+    - |
+      for image in $(make display_images); do
+        if [[ -e ~/docker/$image.tar ]]; then
+          echo "Loading $image.tar"
+          docker load -i ~/docker/$image.tar;
+        fi
+        docker pull dockcross/$image
+      done
 
 test:
   override:
-    - circleci-matrix:
-        parallel: true
+    - make base.test
+    - mkdir -p ~/docker; docker save dockcross/base > ~/docker/base.tar
+    - make android-arm.test
+    - mkdir -p ~/docker; docker save dockcross/android-arm > ~/docker/android-arm.tar
+    - make browser-asmjs.test
+    - mkdir -p ~/docker; docker save dockcross/browser-asmjs > ~/docker/browser-asmjs.tar
+    - make linux-arm64.test
+    - mkdir -p ~/docker; docker save dockcross/linux-arm64 > ~/docker/linux-arm64.tar
+    - make linux-armv5.test
+    - mkdir -p ~/docker; docker save dockcross/linux-armv5 > ~/docker/linux-armv5.tar
+    - make linux-armv6.test
+    - mkdir -p ~/docker; docker save dockcross/linux-armv6 > ~/docker/linux-armv6.tar
+    - make linux-armv7.test
+    - mkdir -p ~/docker; docker save dockcross/linux-armv7 > ~/docker/linux-armv7.tar
+    - make linux-ppc64le.test
+    - mkdir -p ~/docker; docker save dockcross/linux-ppc64le > ~/docker/linux-ppc64le.tar
+    - make linux-x64.test
+    - mkdir -p ~/docker; docker save dockcross/linux-x64 > ~/docker/linux-x64.tar
+    - make linux-x86.test
+    - mkdir -p ~/docker; docker save dockcross/linux-x86 > ~/docker/linux-x86.tar
+    - make manylinux-x64.test
+    - mkdir -p ~/docker; docker save dockcross/manylinux-x64 > ~/docker/manylinux-x64.tar
+    - make manylinux-x86.test
+    - mkdir -p ~/docker; docker save dockcross/manylinux-x86 > ~/docker/manylinux-x86.tar
+    - make windows-x64.test:
         timeout: 3000
-        environment:
-          TASK: test
+    - mkdir -p ~/docker; docker save dockcross/windows-x64 > ~/docker/windows-x64.tar
+    - make windows-x86.test:
+        timeout: 3000
+    - mkdir -p ~/docker; docker save dockcross/windows-x86 > ~/docker/windows-x86.tar
 
 deployment:
   hub:
     branch: master
     commands:
-      - circleci-matrix:
-          parallel: true
-          environment:
-            TASK: deploy
+      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+      - docker push dockcross/base
+      - for image in $(make display_images); do docker push dockcross/$image; done