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

Add android-x86_64 image

Browse Source
This commit is contained in:
Jonas Vautherin
2021-01-12 10:40:35 +01:00
parent e9b6053f5d
commit 0c1f2c9cbf
5 changed files with 112 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
.circleci/config.yml
View File

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