circleci-matrix: Push images as part of the test step

To workaround, CircleCI limitation [1]:

"Please note that since we do not support parallel deployment, specifying
‘parallel:true’ in the deployment phase will cause an error."

This commit moves the deployment step as the last action of the test
step. Doing so will ensure, every container will take care of pushing
images it was responsible to build.

[1] https://circleci.com/docs/parallel-manual-setup/#simple-example

.circleci-matrix.yml

@@ -1,3 +1,4 @@
+
 env:
   - IMAGE=android-arm
   - IMAGE=browser-asmjs
@@ -80,7 +81,7 @@ command:
       mkdir -p ~/docker; time docker save dockcross/$IMAGE > ~/docker/$IMAGE.tar
       echo "Saving dockcross/$IMAGE into ~/docker cache - done"
     fi
-    if [[ $STEP == "deployment" ]]; then
+    if [[ $STEP == "deployment" ]] && [[ "$CIRCLE_BRANCH" == "master" ]]; then
       echo "Docker login"
       docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
       echo "Docker login - done"

circle.yml

@@ -26,13 +26,8 @@ test:
         timeout: 3000
         environment:
           STEP: test
-
-deployment:
-  hub:
-    branch: master
-    commands:
     - circleci-matrix:
         parallel: true
-          timeout: 1800
         environment:
           STEP: deployment
+