Merge branch 'win64' of gitlab.com:librewolf-community/browser/bsys5 into win64
This commit is contained in:
commit
80d56d35ca
1 changed files with 4 additions and 10 deletions
|
|
@ -11,11 +11,8 @@ Build Docker Images:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
||||||
# Needed because we aren't using our custom runners here
|
tags:
|
||||||
services:
|
- autoscale
|
||||||
- docker:dind
|
|
||||||
variables:
|
|
||||||
DOCKER_HOST: tcp://docker:2375
|
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- DISTRO:
|
- DISTRO:
|
||||||
|
|
@ -83,11 +80,8 @@ docker-win64:
|
||||||
only:
|
only:
|
||||||
- win64
|
- win64
|
||||||
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
||||||
# Needed because we aren't using our custom runners here
|
tags:
|
||||||
services:
|
- autoscale
|
||||||
- docker:dind
|
|
||||||
variables:
|
|
||||||
DOCKER_HOST: tcp://docker:2375
|
|
||||||
script:
|
script:
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
|
||||||
- make docker-win64
|
- make docker-win64
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue