Added android-arm64 as a target

This commit is contained in:
Nadav 2018-03-19 14:55:14 +02:00 committed by GitHub
parent 1cad97f9b2
commit bf71007be4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -44,6 +44,25 @@ jobs:
- save_cache: - save_cache:
key: android-arm-assets-{{ .Revision }} key: android-arm-assets-{{ .Revision }}
paths: ~/docker/android-arm.tar 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: browser-asmjs:
<<: *build-settings <<: *build-settings
steps: steps:
@ -333,6 +352,16 @@ jobs:
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/android-arm:latest docker push dockcross/android-arm:latest
fi fi
- restore_cache:
key: android-arm64-assets-{{ .Revision }}
- deploy:
name: Deploy android-arm64
command: |
docker load -i ~/docker/android-arm64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/android-arm64:latest
fi
- restore_cache: - restore_cache:
key: browser-asmjs-assets-{{ .Revision }} key: browser-asmjs-assets-{{ .Revision }}
- deploy: - deploy:
@ -482,6 +511,9 @@ workflows:
- android-arm: - android-arm:
requires: requires:
- base - base
- android-arm64:
requires:
- base
- browser-asmjs: - browser-asmjs:
requires: requires:
- base - base
@ -528,6 +560,7 @@ workflows:
requires: requires:
- base - base
- android-arm - android-arm
- android-arm64
- browser-asmjs - browser-asmjs
- linux-arm64 - linux-arm64
- linux-armv5 - linux-armv5