adapt circleci script

This commit is contained in:
Stanley F 2019-02-28 10:17:32 +01:00
parent 7702019e74
commit 9a3a86a033

View File

@ -306,66 +306,126 @@ jobs:
- save_cache:
key: manylinux-x86-assets-{{ .Revision }}
paths: ~/docker/manylinux-x86.tar
windows-x64:
windows-static-x64:
<<: *build-settings
steps:
- restore_cache:
key: base-assets-{{ .Revision }}
- run:
no_output_timeout: 1.5h
name: windows-x64 build
name: windows-static-x64 build
command: |
docker load -i ~/docker/base.tar
make windows-x64
tagged=$(docker images -q -f 'since=dockcross/windows-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x64)
docker save -o ~/docker/windows-x64.tar dockcross/windows-x64:latest $tagged
make windows-static-x64
tagged=$(docker images -q -f 'since=dockcross/windows-static-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-static-x64)
docker save -o ~/docker/windows-static-x64.tar dockcross/windows-static-x64:latest $tagged
- run:
name: windows-x64 test
name: windows-static-x64 test
command: |
make windows-x64.test
make windows-static-x64.test
- save_cache:
key: windows-x64-assets-{{ .Revision }}
paths: ~/docker/windows-x64.tar
windows-x64-posix:
key: windows-static-x64-assets-{{ .Revision }}
paths: ~/docker/windows-static-x64.tar
windows-static-x64-posix:
<<: *build-settings
steps:
- restore_cache:
key: base-assets-{{ .Revision }}
- run:
no_output_timeout: 1.5h
name: windows-x64-posix build
name: windows-static-x64-posix build
command: |
docker load -i ~/docker/base.tar
make windows-x64-posix
tagged=$(docker images -q -f 'since=dockcross/windows-x64-posix:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x64-posix)
docker save -o ~/docker/windows-x64-posix.tar dockcross/windows-x64-posix:latest $tagged
make windows-static-x64-posix
tagged=$(docker images -q -f 'since=dockcross/windows-static-x64-posix:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-static-x64-posix)
docker save -o ~/docker/windows-static-x64-posix.tar dockcross/windows-static-x64-posix:latest $tagged
- run:
name: windows-x64-posix test
name: windows-static-x64-posix test
command: |
make windows-x64-posix.test
make windows-static-x64-posix.test
- save_cache:
key: windows-x64-posix-assets-{{ .Revision }}
paths: ~/docker/windows-x64-posix.tar
windows-x86:
key: windows-static-x64-posix-assets-{{ .Revision }}
paths: ~/docker/windows-static-x64-posix.tar
windows-static-x86:
<<: *build-settings
steps:
- restore_cache:
key: base-assets-{{ .Revision }}
- run:
no_output_timeout: 1.5h
name: windows-x86 build
name: windows-static-x86 build
command: |
docker load -i ~/docker/base.tar
make windows-x86
tagged=$(docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x86)
docker save -o ~/docker/windows-x86.tar dockcross/windows-x86:latest $tagged
make windows-static-x86
tagged=$(docker images -q -f 'since=dockcross/windows-static-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-static-x86)
docker save -o ~/docker/windows-static-x86.tar dockcross/windows-static-x86:latest $tagged
- run:
name: windows-x86 test
name: windows-static-x86 test
command: |
make windows-x86.test
make windows-static-x86.test
- save_cache:
key: windows-x86-assets-{{ .Revision }}
paths: ~/docker/windows-x86.tar
key: windows-static-x86-assets-{{ .Revision }}
paths: ~/docker/windows-static-x86.tar
windows-shared-x64:
<<: *build-settings
steps:
- restore_cache:
key: base-assets-{{ .Revision }}
- run:
no_output_timeout: 1.5h
name: windows-shared-x64 build
command: |
docker load -i ~/docker/base.tar
make windows-shared-x64
tagged=$(docker images -q -f 'since=dockcross/windows-shared-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-shared-x64)
docker save -o ~/docker/windows-shared-x64.tar dockcross/windows-shared-x64:latest $tagged
- run:
name: windows-shared-x64 test
command: |
make windows-shared-x64.test
- save_cache:
key: windows-shared-x64-assets-{{ .Revision }}
paths: ~/docker/windows-shared-x64.tar
windows-shared-x64-posix:
<<: *build-settings
steps:
- restore_cache:
key: base-assets-{{ .Revision }}
- run:
no_output_timeout: 1.5h
name: windows-shared-x64-posix build
command: |
docker load -i ~/docker/base.tar
make windows-shared-x64-posix
tagged=$(docker images -q -f 'since=dockcross/windows-shared-x64-posix:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-shared-x64-posix)
docker save -o ~/docker/windows-shared-x64-posix.tar dockcross/windows-shared-x64-posix:latest $tagged
- run:
name: windows-shared-x64-posix test
command: |
make windows-shared-x64-posix.test
- save_cache:
key: windows-shared-x64-posix-assets-{{ .Revision }}
paths: ~/docker/windows-shared-x64-posix.tar
windows-shared-x86:
<<: *build-settings
steps:
- restore_cache:
key: base-assets-{{ .Revision }}
- run:
no_output_timeout: 1.5h
name: windows-shared-x86 build
command: |
docker load -i ~/docker/base.tar
make windows-shared-x86
tagged=$(docker images -q -f 'since=dockcross/windows-shared-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-shared-x86)
docker save -o ~/docker/windows-shared-x86.tar dockcross/windows-shared-x86:latest $tagged
- run:
name: windows-shared-x86 test
command: |
make windows-shared-x86.test
- save_cache:
key: windows-shared-x86-assets-{{ .Revision }}
paths: ~/docker/windows-shared-x86.tar
deploy:
<<: *build-settings
steps:
@ -550,39 +610,75 @@ jobs:
docker push $tagged
fi
- restore_cache:
key: windows-x64-assets-{{ .Revision }}
key: windows-static-x64-assets-{{ .Revision }}
- deploy:
name: Deploy windows-x64
name: Deploy windows-static-x64
command: |
docker load -i ~/docker/windows-x64.tar
docker load -i ~/docker/windows-static-x64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/windows-x64:latest
tagged=$(docker images -q -f 'since=dockcross/windows-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x64)
docker push dockcross/windows-static-x64:latest
tagged=$(docker images -q -f 'since=dockcross/windows-static-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-static-x64)
docker push $tagged
fi
- restore_cache:
key: windows-x64-posix-assets-{{ .Revision }}
key: windows-static-x64-posix-assets-{{ .Revision }}
- deploy:
name: Deploy windows-x64-posix
name: Deploy windows-static-x64-posix
command: |
docker load -i ~/docker/windows-x64-posix.tar
docker load -i ~/docker/windows-static-x64-posix.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/windows-x64-posix:latest
tagged=$(docker images -q -f 'since=dockcross/windows-x64-posix:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x64-posix)
docker push dockcross/windows-static-x64-posix:latest
tagged=$(docker images -q -f 'since=dockcross/windows-static-x64-posix:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-static-x64-posix)
docker push $tagged
fi
- restore_cache:
key: windows-x86-assets-{{ .Revision }}
key: windows-static-x86-assets-{{ .Revision }}
- deploy:
name: Deploy windows-x86
name: Deploy windows-static-x86
command: |
docker load -i ~/docker/windows-x86.tar
docker load -i ~/docker/windows-static-x86.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/windows-x86:latest
tagged=$(docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x86)
docker push dockcross/windows-static-x86:latest
tagged=$(docker images -q -f 'since=dockcross/windows-static-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-static-x86)
docker push $tagged
fi
- restore_cache:
key: windows-shared-x64-assets-{{ .Revision }}
- deploy:
name: Deploy windows-shared-x64
command: |
docker load -i ~/docker/windows-shared-x64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/windows-shared-x64:latest
tagged=$(docker images -q -f 'since=dockcross/windows-shared-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-shared-x64)
docker push $tagged
fi
- restore_cache:
key: windows-shared-x64-posix-assets-{{ .Revision }}
- deploy:
name: Deploy windows-shared-x64-posix
command: |
docker load -i ~/docker/windows-shared-x64-posix.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/windows-shared-x64-posix:latest
tagged=$(docker images -q -f 'since=dockcross/windows-shared-x64-posix:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-shared-x64-posix)
docker push $tagged
fi
- restore_cache:
key: windows-shared-x86-assets-{{ .Revision }}
- deploy:
name: Deploy windows-shared-x86
command: |
docker load -i ~/docker/windows-shared-x86.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/windows-shared-x86:latest
tagged=$(docker images -q -f 'since=dockcross/windows-shared-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-shared-x86)
docker push $tagged
fi
@ -635,13 +731,22 @@ workflows:
- manylinux-x86:
requires:
- base
- windows-x64:
- windows-static-x64:
requires:
- base
- windows-x64-posix:
- windows-static-x64-posix:
requires:
- base
- windows-x86:
- windows-static-x86:
requires:
- base
- windows-shared-x64:
requires:
- base
- windows-shared-x64-posix:
requires:
- base
- windows-shared-x86:
requires:
- base
- deploy:
@ -662,6 +767,9 @@ workflows:
- linux-x86
- manylinux-x64
- manylinux-x86
- windows-x64
- windows-x64-posix
- windows-x86
- windows-static-x64
- windows-static-x64-posix
- windows-static-x86
- windows-shared-x64
- windows-shared-x64-posix
- windows-shared-x86