Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #251 from thewtex/linux-armv5-armv7-deploy

Browse Source 
linux-armv5,linux-armv7: Reenable deployment
This commit is contained in:
Jean-Christophe Fillion-Robin 2018-08-20 11:27:19 -04:00 committed by GitHub
commit 5a8b47357a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
.circleci/config.yml
View File

@ -106,18 +106,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-armv5 build
#name: linux-armv5 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-armv5
#make linux-armv5 docker save -o ~/docker/linux-armv5.tar dockcross/linux-armv5:latest
#docker save -o ~/docker/linux-armv5.tar dockcross/linux-armv5:latest - run:
#- run: name: linux-armv5 test
#name: linux-armv5 test command: |
#command: | make linux-armv5.test
#make linux-armv5.test
- save_cache: - save_cache:
key: linux-armv5-assets-{{ .Revision }} key: linux-armv5-assets-{{ .Revision }}
paths: ~/docker/linux-armv5.tar paths: ~/docker/linux-armv5.tar
@ -145,18 +144,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-armv7 build
#name: linux-armv7 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-armv7
#make linux-armv7 docker save -o ~/docker/linux-armv7.tar dockcross/linux-armv7:latest
#docker save -o ~/docker/linux-armv7.tar dockcross/linux-armv7:latest - run:
#- run: name: linux-armv7 test
#name: linux-armv7 test command: |
#command: | make linux-armv7.test
#make linux-armv7.test
- save_cache: - save_cache:
key: linux-armv7-assets-{{ .Revision }} key: linux-armv7-assets-{{ .Revision }}
paths: ~/docker/linux-armv7.tar paths: ~/docker/linux-armv7.tar
@ -405,17 +403,16 @@ jobs:
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 - restore_cache:
#- restore_cache: key: linux-armv5-assets-{{ .Revision }}
#key: linux-armv5-assets-{{ .Revision }} - deploy:
#- deploy: name: Deploy linux-armv5
#name: Deploy linux-armv5 command: |
#command: | docker load -i ~/docker/linux-armv5.tar
#docker load -i ~/docker/linux-armv5.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-armv5:latest
#docker push dockcross/linux-armv5:latest fi
#fi
- restore_cache: - restore_cache:
key: linux-armv6-assets-{{ .Revision }} key: linux-armv6-assets-{{ .Revision }}
- deploy: - deploy:
@ -426,17 +423,16 @@ jobs:
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/linux-armv6:latest docker push dockcross/linux-armv6:latest
fi fi
# Image build currently broken. See #209 - restore_cache:
#- restore_cache: key: linux-armv7-assets-{{ .Revision }}
#key: linux-armv7-assets-{{ .Revision }} - deploy:
#- deploy: name: Deploy linux-armv7
#name: Deploy linux-armv7 command: |
#command: | docker load -i ~/docker/linux-armv7.tar
#docker load -i ~/docker/linux-armv7.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-armv7:latest
#docker push dockcross/linux-armv7:latest fi
#fi
# Image build currently broken. See #209 # Image build currently broken. See #209
#- restore_cache: #- restore_cache:
#key: linux-mipsel-assets-{{ .Revision }} #key: linux-mipsel-assets-{{ .Revision }}
@ -557,17 +553,15 @@ workflows:
- linux-arm64: - linux-arm64:
requires: requires:
- base - base
# Image build currently broken. See #209 - linux-armv5:
#- linux-armv5: requires:
#requires: - base
#- base
- linux-armv6: - linux-armv6:
requires: requires:
- base - base
# Image build currently broken. See #209 - linux-armv7:
#- linux-armv7: requires:
#requires: - base
#- base
# Image build currently broken. See #209 # Image build currently broken. See #209
#- linux-mipsel: #- linux-mipsel:
#requires: #requires:
@ -607,10 +601,9 @@ workflows:
- android-arm64 - android-arm64
- browser-asmjs - browser-asmjs
- linux-arm64 - linux-arm64
#- linux-armv5 - linux-armv5
- linux-armv6 - linux-armv6
# Image build currently broken. See #209 - linux-armv7
#- linux-armv7
#- linux-mipsel #- linux-mipsel
- linux-s390x - linux-s390x
# Image build currently broken. See #209 # Image build currently broken. See #209

1
common.manylinux
View File

@ -13,6 +13,7 @@ RUN \
gettext \ gettext \
openssh-clients \ openssh-clients \
pax \ pax \
wget \
zip \ zip \
&& \ && \
yum clean all && \ yum clean all && \