Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-13 22:49:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add android-x86 image

Browse Source
This commit is contained in:
Jonas Vautherin
2021-01-12 01:03:33 +01:00
parent 7e58f935e2
commit e9b6053f5d
5 changed files with 113 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
.circleci/config.yml
View File

@ -64,6 +64,27 @@ jobs:
- save_cache:
key: android-arm64-assets-{{ .Revision }}
paths: ~/docker/android-arm64.tar
android-x86:
<<: *build-settings
steps:
- restore_cache:
key: base-assets-{{ .Revision }}
- run:
name: android-x86 build
no_output_timeout: 1.5h
command: |
docker load -i ~/docker/base.tar
make android-x86
tagged=$(docker images -q -f 'since=dockcross/android-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep android-x86)
docker save -o ~/docker/android-x86.tar dockcross/android-x86:latest $tagged
- run:
name: android-x86 test
command: |
make android-x86.test
- save_cache:
key: android-x86-assets-{{ .Revision }}
paths: ~/docker/android-x86.tar
web-wasm:
<<: *build-settings
steps:
@ -662,6 +683,18 @@ jobs:
tagged=$(docker images -q -f 'since=dockcross/android-arm64:latest' --format '{{.Repository}}:{{.Tag}}' | grep android-arm64)
docker push $tagged
fi
- restore_cache:
key: android-x86-assets-{{ .Revision }}
- deploy:
name: Deploy android-x86
command: |
docker load -i ~/docker/android-x86.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/android-x86:latest
tagged=$(docker images -q -f 'since=dockcross/android-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep android-x86)
docker push $tagged
fi
- restore_cache:
key: web-wasm-assets-{{ .Revision }}
- deploy:
@ -1001,6 +1034,9 @@ workflows:
- android-arm64:
requires:
- base
- android-x86:
requires:
- base
- web-wasm:
requires:
- base
@ -1090,6 +1126,7 @@ workflows:
- base
- android-arm
- android-arm64
- android-x86
- web-wasm
- linux-arm64
- linux-arm64-musl