mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 00:54:26 +01:00
Re-added linux-arm64 to .circleci/config.yml
This commit is contained in:
parent
47b473054a
commit
08f89a8ae7
@ -87,18 +87,17 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
key: base-assets-{{ .Revision }}
|
key: base-assets-{{ .Revision }}
|
||||||
# Image build currently broken. See #209
|
- run:
|
||||||
#- run:
|
name: linux-arm64 build
|
||||||
#name: linux-arm64 build
|
no_output_timeout: 1.5h
|
||||||
#no_output_timeout: 1.5h
|
command: |
|
||||||
#command: |
|
docker load -i ~/docker/base.tar
|
||||||
#docker load -i ~/docker/base.tar
|
make linux-arm64
|
||||||
#make linux-arm64
|
docker save -o ~/docker/linux-arm64.tar dockcross/linux-arm64:latest
|
||||||
#docker save -o ~/docker/linux-arm64.tar dockcross/linux-arm64:latest
|
- run:
|
||||||
#- run:
|
name: linux-arm64 test
|
||||||
#name: linux-arm64 test
|
command: |
|
||||||
#command: |
|
make linux-arm64.test
|
||||||
#make linux-arm64.test
|
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: linux-arm64-assets-{{ .Revision }}
|
key: linux-arm64-assets-{{ .Revision }}
|
||||||
paths: ~/docker/linux-arm64.tar
|
paths: ~/docker/linux-arm64.tar
|
||||||
@ -377,17 +376,16 @@ jobs:
|
|||||||
docker login -u $DOCKER_USER -p $DOCKER_PASS
|
docker login -u $DOCKER_USER -p $DOCKER_PASS
|
||||||
docker push dockcross/browser-asmjs:latest
|
docker push dockcross/browser-asmjs:latest
|
||||||
fi
|
fi
|
||||||
# Image build currently broken. See #209
|
- restore_cache:
|
||||||
#- restore_cache:
|
key: linux-arm64-assets-{{ .Revision }}
|
||||||
#key: linux-arm64-assets-{{ .Revision }}
|
- deploy:
|
||||||
#- deploy:
|
name: Deploy linux-arm64
|
||||||
#name: Deploy linux-arm64
|
command: |
|
||||||
#command: |
|
docker load -i ~/docker/linux-arm64.tar
|
||||||
#docker load -i ~/docker/linux-arm64.tar
|
if [ "${CIRCLE_BRANCH}" == "master" ]; then
|
||||||
#if [ "${CIRCLE_BRANCH}" == "master" ]; then
|
docker login -u $DOCKER_USER -p $DOCKER_PASS
|
||||||
#docker login -u $DOCKER_USER -p $DOCKER_PASS
|
docker push dockcross/linux-arm64:latest
|
||||||
#docker push dockcross/linux-arm64:latest
|
fi
|
||||||
#fi
|
|
||||||
# Image build currently broken. See #209
|
# Image build currently broken. See #209
|
||||||
#- restore_cache:
|
#- restore_cache:
|
||||||
#key: linux-armv5-assets-{{ .Revision }}
|
#key: linux-armv5-assets-{{ .Revision }}
|
||||||
@ -527,10 +525,9 @@ workflows:
|
|||||||
- browser-asmjs:
|
- browser-asmjs:
|
||||||
requires:
|
requires:
|
||||||
- base
|
- base
|
||||||
# Image build currently broken. See #209
|
- linux-arm64:
|
||||||
#- linux-arm64:
|
requires:
|
||||||
#requires:
|
- base
|
||||||
#- base
|
|
||||||
# Image build currently broken. See #209
|
# Image build currently broken. See #209
|
||||||
#- linux-armv5:
|
#- linux-armv5:
|
||||||
#requires:
|
#requires:
|
||||||
@ -577,8 +574,7 @@ workflows:
|
|||||||
- android-arm
|
- android-arm
|
||||||
- android-arm64
|
- android-arm64
|
||||||
- browser-asmjs
|
- browser-asmjs
|
||||||
# Image build currently broken. See #209
|
- linux-arm64
|
||||||
#- linux-arm64
|
|
||||||
#- linux-armv5
|
#- linux-armv5
|
||||||
- linux-armv6
|
- linux-armv6
|
||||||
# Image build currently broken. See #209
|
# Image build currently broken. See #209
|
||||||
|
Loading…
Reference in New Issue
Block a user