mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-11-10 05:07:26 +01:00
[windows_x64_posix] Updated circle-ci config.yml to take into account windows-x64-posix
This commit is contained in:
parent
9997a896ae
commit
957e7ae031
@ -314,6 +314,25 @@ jobs:
|
|||||||
- save_cache:
|
- save_cache:
|
||||||
key: windows-x64-assets-{{ .Revision }}
|
key: windows-x64-assets-{{ .Revision }}
|
||||||
paths: ~/docker/windows-x64.tar
|
paths: ~/docker/windows-x64.tar
|
||||||
|
windows-x64-posix:
|
||||||
|
<<: *build-settings
|
||||||
|
steps:
|
||||||
|
- restore_cache:
|
||||||
|
key: base-assets-{{ .Revision }}
|
||||||
|
- run:
|
||||||
|
no_output_timeout: 1.5h
|
||||||
|
name: windows-x64-posix build
|
||||||
|
command: |
|
||||||
|
docker load -i ~/docker/base.tar
|
||||||
|
make windows-x64-posix
|
||||||
|
docker save -o ~/docker/windows-x64-posix.tar dockcross/windows-x64-posix:latest
|
||||||
|
- run:
|
||||||
|
name: windows-x64-posix test
|
||||||
|
command: |
|
||||||
|
make windows-x64-posix.test
|
||||||
|
- save_cache:
|
||||||
|
key: windows-x64-posix-assets-{{ .Revision }}
|
||||||
|
paths: ~/docker/windows-x64-posix.tar
|
||||||
windows-x86:
|
windows-x86:
|
||||||
<<: *build-settings
|
<<: *build-settings
|
||||||
steps:
|
steps:
|
||||||
@ -500,6 +519,16 @@ jobs:
|
|||||||
docker login -u $DOCKER_USER -p $DOCKER_PASS
|
docker login -u $DOCKER_USER -p $DOCKER_PASS
|
||||||
docker push dockcross/windows-x64:latest
|
docker push dockcross/windows-x64:latest
|
||||||
fi
|
fi
|
||||||
|
- restore_cache:
|
||||||
|
key: windows-x64-posix-assets-{{ .Revision }}
|
||||||
|
- deploy:
|
||||||
|
name: Deploy windows-x64-posix
|
||||||
|
command: |
|
||||||
|
docker load -i ~/docker/windows-x64-posix.tar
|
||||||
|
if [ "${CIRCLE_BRANCH}" == "master" ]; then
|
||||||
|
docker login -u $DOCKER_USER -p $DOCKER_PASS
|
||||||
|
docker push dockcross/windows-x64-posix:latest
|
||||||
|
fi
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
key: windows-x86-assets-{{ .Revision }}
|
key: windows-x86-assets-{{ .Revision }}
|
||||||
- deploy:
|
- deploy:
|
||||||
@ -565,6 +594,9 @@ workflows:
|
|||||||
- windows-x64:
|
- windows-x64:
|
||||||
requires:
|
requires:
|
||||||
- base
|
- base
|
||||||
|
- windows-x64-posix:
|
||||||
|
requires:
|
||||||
|
- base
|
||||||
- windows-x86:
|
- windows-x86:
|
||||||
requires:
|
requires:
|
||||||
- base
|
- base
|
||||||
@ -588,4 +620,5 @@ workflows:
|
|||||||
- manylinux-x64
|
- manylinux-x64
|
||||||
- manylinux-x86
|
- manylinux-x86
|
||||||
- windows-x64
|
- windows-x64
|
||||||
|
- windows-x64-posix
|
||||||
- windows-x86
|
- windows-x86
|
||||||
|
Loading…
Reference in New Issue
Block a user