diff --git a/.circleci/config.yml b/.circleci/config.yml index cb27b5b..f3db20c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -87,18 +87,17 @@ jobs: steps: - restore_cache: key: base-assets-{{ .Revision }} - # 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 + - 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 @@ -377,17 +376,16 @@ jobs: docker login -u $DOCKER_USER -p $DOCKER_PASS 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 + - 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 }} @@ -527,10 +525,9 @@ workflows: - browser-asmjs: requires: - base - # Image build currently broken. See #209 - #- linux-arm64: - #requires: - #- base + - linux-arm64: + requires: + - base # Image build currently broken. See #209 #- linux-armv5: #requires: @@ -577,8 +574,7 @@ workflows: - android-arm - android-arm64 - browser-asmjs - # Image build currently broken. See #209 - #- linux-arm64 + - linux-arm64 #- linux-armv5 - linux-armv6 # Image build currently broken. See #209