mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-11-10 05:07:26 +01:00
Added android-arm64 as a target
This commit is contained in:
parent
1cad97f9b2
commit
bf71007be4
@ -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:
|
||||
@ -333,6 +352,16 @@ jobs:
|
||||
docker login -u $DOCKER_USER -p $DOCKER_PASS
|
||||
docker push dockcross/android-arm:latest
|
||||
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:
|
||||
key: browser-asmjs-assets-{{ .Revision }}
|
||||
- deploy:
|
||||
@ -482,6 +511,9 @@ workflows:
|
||||
- android-arm:
|
||||
requires:
|
||||
- base
|
||||
- android-arm64:
|
||||
requires:
|
||||
- base
|
||||
- browser-asmjs:
|
||||
requires:
|
||||
- base
|
||||
@ -528,6 +560,7 @@ workflows:
|
||||
requires:
|
||||
- base
|
||||
- android-arm
|
||||
- android-arm64
|
||||
- browser-asmjs
|
||||
- linux-arm64
|
||||
- linux-armv5
|
||||
|
Loading…
Reference in New Issue
Block a user