diff options
| author | Steve Azzopardi <steveazz@outlook.com> | 2019-03-06 14:59:44 +0100 |
|---|---|---|
| committer | Steve Azzopardi <steveazz@outlook.com> | 2019-03-06 16:09:37 +0100 |
| commit | 61d44e5874b9e13550a01242983ec9838a5a3736 (patch) | |
| tree | ba2910bf71b319af46b36d3bc47568c996c786ea /.gitlab-ci.yml | |
| parent | Merge branch 'fix-master-oneachshell' into 'master' (diff) | |
| download | gitlab-runner-61d44e5874b9e13550a01242983ec9838a5a3736.tar.gz | |
Set WINDOWS_VERSION for bleeding and stable jobs
We are overriding the variables, since `PUSH_TO_DOCKER_HUB` is being
set. Redeclare the `WINDOWS_VERSION` using the `&windows180x_variable`
anchor, the same way as `&docker_variables` is being used.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cfa0e2f..3a899c41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,14 +36,14 @@ image: $CI_IMAGE - docker .windows1803: &windows1803 - variables: + variables: &windows1803_variables WINDOWS_VERSION: nanoserver1803 tags: - windows-1803 - shell .windows1809: &windows1809 - variables: + variables: &windows1809_variables WINDOWS_VERSION: nanoserver1809 tags: - windows-1809 @@ -522,6 +522,7 @@ bleeding edge nanoserver1803 docker images: <<: *windows1803 extends: .build_windows_docker_images variables: + <<: *windows1803_variables PUSH_TO_DOCKER_HUB: "true" environment: name: bleeding_edge/docker_images/windows1803 @@ -532,6 +533,7 @@ bleeding edge nanoserver1809 docker images: <<: *windows1809 extends: .build_windows_docker_images variables: + <<: *windows1809_variables PUSH_TO_DOCKER_HUB: "true" environment: name: bleeding_edge/docker_images/windows1809 @@ -563,6 +565,7 @@ stable nanoserver1803 docker images: <<: *windows1803 extends: .build_windows_docker_images variables: + <<: *windows1803_variables PUSH_TO_DOCKER_HUB: "true" environment: name: stable/docker_images/windows1803 @@ -573,6 +576,7 @@ stable nanoserver1809 docker images: <<: *windows1809 extends: .build_windows_docker_images variables: + <<: *windows1809_variables PUSH_TO_DOCKER_HUB: "true" environment: name: stable/docker_images/windows1809 |