Merge pull request #1 from dockcross/master

merge
Nadav-Ruskin · Apr 25, 2018 · e2c5545 · e2c5545
2 parents 5e7bd3a + 97fdb76
commit e2c5545
Show file tree

Hide file tree

Showing 26 changed files with 675 additions and 348 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -44,6 +44,25 @@ jobs:
       - save_cache:
           key: android-arm-assets-{{ .Revision }}
           paths: ~/docker/android-arm.tar
+  android-arm64:
+    <<: *build-settings
+    steps:
+      - restore_cache:
+          key: base-assets-{{ .Revision }}
+      - run:
+         name: android-arm64 build
+         no_output_timeout: 1.5h
+         command: |
+           docker load -i ~/docker/base.tar
+           make android-arm64
+           docker save -o ~/docker/android-arm64.tar dockcross/android-arm64:latest
+      - run:
+         name: android-arm64 test
+         command: |
+           make android-arm64.test
+      - save_cache:
+          key: android-arm64-assets-{{ .Revision }}
+          paths: ~/docker/android-arm64.tar
   browser-asmjs:
     <<: *build-settings
     steps:
@@ -68,17 +87,18 @@ jobs:
     steps:
       - restore_cache:
           key: base-assets-{{ .Revision }}
-      - run:
-         name: linux-arm64 build
-         no_output_timeout: 1.5h
-         command: |
-           docker load -i ~/docker/base.tar
-           make linux-arm64
-           docker save -o ~/docker/linux-arm64.tar dockcross/linux-arm64:latest
-      - run:
-         name: linux-arm64 test
-         command: |
-           make linux-arm64.test
+      # Image build currently broken. See #209
+      #- run:
+         #name: linux-arm64 build
+         #no_output_timeout: 1.5h
+         #command: |
+           #docker load -i ~/docker/base.tar
+           #make linux-arm64
+           #docker save -o ~/docker/linux-arm64.tar dockcross/linux-arm64:latest
+      #- run:
+         #name: linux-arm64 test
+         #command: |
+           #make linux-arm64.test
       - save_cache:
           key: linux-arm64-assets-{{ .Revision }}
           paths: ~/docker/linux-arm64.tar
@@ -87,17 +107,18 @@ jobs:
     steps:
       - restore_cache:
           key: base-assets-{{ .Revision }}
-      - run:
-         name: linux-armv5 build
-         no_output_timeout: 1.5h
-         command: |
-           docker load -i ~/docker/base.tar
-           make linux-armv5
-           docker save -o ~/docker/linux-armv5.tar dockcross/linux-armv5:latest
-      - run:
-         name: linux-armv5 test
-         command: |
-           make linux-armv5.test
+      # Image build currently broken. See #209
+      #- run:
+         #name: linux-armv5 build
+         #no_output_timeout: 1.5h
+         #command: |
+           #docker load -i ~/docker/base.tar
+           #make linux-armv5
+           #docker save -o ~/docker/linux-armv5.tar dockcross/linux-armv5:latest
+      #- run:
+         #name: linux-armv5 test
+         #command: |
+           #make linux-armv5.test
       - save_cache:
           key: linux-armv5-assets-{{ .Revision }}
           paths: ~/docker/linux-armv5.tar
@@ -125,17 +146,18 @@ jobs:
     steps:
       - restore_cache:
           key: base-assets-{{ .Revision }}
-      - run:
-         name: linux-armv7 build
-         no_output_timeout: 1.5h
-         command: |
-           docker load -i ~/docker/base.tar
-           make linux-armv7
-           docker save -o ~/docker/linux-armv7.tar dockcross/linux-armv7:latest
-      - run:
-         name: linux-armv7 test
-         command: |
-           make linux-armv7.test
+      # Image build currently broken. See #209
+      #- run:
+         #name: linux-armv7 build
+         #no_output_timeout: 1.5h
+         #command: |
+           #docker load -i ~/docker/base.tar
+           #make linux-armv7
+           #docker save -o ~/docker/linux-armv7.tar dockcross/linux-armv7:latest
+      #- run:
+         #name: linux-armv7 test
+         #command: |
+           #make linux-armv7.test
       - save_cache:
           key: linux-armv7-assets-{{ .Revision }}
           paths: ~/docker/linux-armv7.tar
@@ -144,17 +166,18 @@ jobs:
     steps:
       - restore_cache:
           key: base-assets-{{ .Revision }}
-      - run:
-         name: linux-mipsel build
-         no_output_timeout: 1.5h
-         command: |
-           docker load -i ~/docker/base.tar
-           make linux-mipsel
-           docker save -o ~/docker/linux-mipsel.tar dockcross/linux-mipsel:latest
-      - run:
-         name: linux-mipsel test
-         command: |
-           make linux-mipsel.test
+      # Image build currently broken. See #209
+      #- run:
+         #name: linux-mipsel build
+         #no_output_timeout: 1.5h
+         #command: |
+           #docker load -i ~/docker/base.tar
+           #make linux-mipsel
+           #docker save -o ~/docker/linux-mipsel.tar dockcross/linux-mipsel:latest
+      #- run:
+         #name: linux-mipsel test
+         #command: |
+           #make linux-mipsel.test
       - save_cache:
           key: linux-mipsel-assets-{{ .Revision }}
           paths: ~/docker/linux-mipsel.tar
@@ -182,17 +205,18 @@ jobs:
     steps:
       - restore_cache:
           key: base-assets-{{ .Revision }}
-      - run:
-         name: linux-ppc64le build
-         no_output_timeout: 1.5h
-         command: |
-           docker load -i ~/docker/base.tar
-           make linux-ppc64le
-           docker save -o ~/docker/linux-ppc64le.tar dockcross/linux-ppc64le:latest
-      - run:
-         name: linux-ppc64le test
-         command: |
-           make linux-ppc64le.test
+      # Image build currently broken. See #209
+      #- run:
+         #name: linux-ppc64le build
+         #no_output_timeout: 1.5h
+         #command: |
+           #docker load -i ~/docker/base.tar
+           #make linux-ppc64le
+           #docker save -o ~/docker/linux-ppc64le.tar dockcross/linux-ppc64le:latest
+      #- run:
+         #name: linux-ppc64le test
+         #command: |
+           #make linux-ppc64le.test
       - save_cache:
           key: linux-ppc64le-assets-{{ .Revision }}
           paths: ~/docker/linux-ppc64le.tar
@@ -334,35 +358,47 @@ jobs:
               docker push dockcross/android-arm:latest
             fi
       - restore_cache:
-          key: browser-asmjs-assets-{{ .Revision }}
-      - deploy:
-          name: Deploy browser-asmjs
-          command: |
-            docker load -i ~/docker/browser-asmjs.tar
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker push dockcross/browser-asmjs:latest
-            fi
-      - restore_cache:
-          key: linux-arm64-assets-{{ .Revision }}
+          key: android-arm64-assets-{{ .Revision }}
       - deploy:
-          name: Deploy linux-arm64
+          name: Deploy android-arm64
           command: |
-            docker load -i ~/docker/linux-arm64.tar
+            docker load -i ~/docker/android-arm64.tar
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker push dockcross/linux-arm64:latest
+              docker push dockcross/android-arm64:latest
             fi
       - restore_cache:
-          key: linux-armv5-assets-{{ .Revision }}
+          key: browser-asmjs-assets-{{ .Revision }}
       - deploy:
-          name: Deploy linux-armv5
+          name: Deploy browser-asmjs
           command: |
-            docker load -i ~/docker/linux-armv5.tar
+            docker load -i ~/docker/browser-asmjs.tar
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker push dockcross/linux-armv5:latest
+              docker push dockcross/browser-asmjs:latest
             fi
+      # Image build currently broken. See #209
+      #- restore_cache:
+          #key: linux-arm64-assets-{{ .Revision }}
+      #- deploy:
+          #name: Deploy linux-arm64
+          #command: |
+            #docker load -i ~/docker/linux-arm64.tar
+            #if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              #docker login -u $DOCKER_USER -p $DOCKER_PASS
+              #docker push dockcross/linux-arm64:latest
+            #fi
+      # Image build currently broken. See #209
+      #- restore_cache:
+          #key: linux-armv5-assets-{{ .Revision }}
+      #- deploy:
+          #name: Deploy linux-armv5
+          #command: |
+            #docker load -i ~/docker/linux-armv5.tar
+            #if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              #docker login -u $DOCKER_USER -p $DOCKER_PASS
+              #docker push dockcross/linux-armv5:latest
+            #fi
       - restore_cache:
           key: linux-armv6-assets-{{ .Revision }}
       - deploy:
@@ -373,26 +409,28 @@ jobs:
               docker login -u $DOCKER_USER -p $DOCKER_PASS
               docker push dockcross/linux-armv6:latest
             fi
-      - restore_cache:
-          key: linux-armv7-assets-{{ .Revision }}
-      - deploy:
-          name: Deploy linux-armv7
-          command: |
-            docker load -i ~/docker/linux-armv7.tar
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker push dockcross/linux-armv7:latest
-            fi
-      - restore_cache:
-          key: linux-mipsel-assets-{{ .Revision }}
-      - deploy:
-          name: Deploy linux-mipsel
-          command: |
-            docker load -i ~/docker/linux-mipsel.tar
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker push dockcross/linux-mipsel:latest
-            fi
+      # Image build currently broken. See #209
+      #- restore_cache:
+          #key: linux-armv7-assets-{{ .Revision }}
+      #- deploy:
+          #name: Deploy linux-armv7
+          #command: |
+            #docker load -i ~/docker/linux-armv7.tar
+            #if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              #docker login -u $DOCKER_USER -p $DOCKER_PASS
+              #docker push dockcross/linux-armv7:latest
+            #fi
+      # Image build currently broken. See #209
+      #- restore_cache:
+          #key: linux-mipsel-assets-{{ .Revision }}
+      #- deploy:
+          #name: Deploy linux-mipsel
+          #command: |
+            #docker load -i ~/docker/linux-mipsel.tar
+            #if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              #docker login -u $DOCKER_USER -p $DOCKER_PASS
+              #docker push dockcross/linux-mipsel:latest
+            #fi
       - restore_cache:
           key: linux-s390x-assets-{{ .Revision }}
       - deploy:
@@ -403,16 +441,17 @@ jobs:
               docker login -u $DOCKER_USER -p $DOCKER_PASS
               docker push dockcross/linux-s390x:latest
             fi
-      - restore_cache:
-          key: linux-ppc64le-assets-{{ .Revision }}
-      - deploy:
-          name: Deploy linux-ppc64le
-          command: |
-            docker load -i ~/docker/linux-ppc64le.tar
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker push dockcross/linux-ppc64le:latest
-            fi
+      # Image build currently broken. See #209
+      #- restore_cache:
+          #key: linux-ppc64le-assets-{{ .Revision }}
+      #- deploy:
+          #name: Deploy linux-ppc64le
+          #command: |
+            #docker load -i ~/docker/linux-ppc64le.tar
+            #if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              #docker login -u $DOCKER_USER -p $DOCKER_PASS
+              #docker push dockcross/linux-ppc64le:latest
+            #fi
       - restore_cache:
           key: linux-x64-assets-{{ .Revision }}
       - deploy:
@@ -482,30 +521,38 @@ workflows:
         - android-arm:
             requires:
               - base
-        - browser-asmjs:
-            requires:
-              - base
-        - linux-arm64:
+        - android-arm64:
             requires:
               - base
-        - linux-armv5:
+        - browser-asmjs:
             requires:
               - base
+        # Image build currently broken. See #209
+        #- linux-arm64:
+            #requires:
+              #- base
+        # Image build currently broken. See #209
+        #- linux-armv5:
+            #requires:
+              #- base
         - linux-armv6:
             requires:
               - base
-        - linux-armv7:
-            requires:
-              - base
-        - linux-mipsel:
-            requires:
-              - base
+        # Image build currently broken. See #209
+        #- linux-armv7:
+            #requires:
+              #- base
+        # Image build currently broken. See #209
+        #- linux-mipsel:
+            #requires:
+              #- base
         - linux-s390x:
             requires:
               - base
-        - linux-ppc64le:
-            requires:
-              - base
+        # Image build currently broken. See #209
+        #- linux-ppc64le:
+            #requires:
+              #- base
         - linux-x64:
             requires:
               - base
@@ -528,14 +575,18 @@ workflows:
             requires:
               - base
               - android-arm
+              - android-arm64
               - browser-asmjs
-              - linux-arm64
-              - linux-armv5
+              # Image build currently broken. See #209
+              #- linux-arm64
+              #- linux-armv5
               - linux-armv6
-              - linux-armv7
-              - linux-mipsel
+              # Image build currently broken. See #209
+              #- linux-armv7
+              #- linux-mipsel
               - linux-s390x
-              - linux-ppc64le
+              # Image build currently broken. See #209
+              #- linux-ppc64le
               - linux-x64
               - linux-x86
               - manylinux-x64