mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 18:46:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: switch the windows CI to server 2022

Browse source
This commit is contained in:
Jordan Petridis 2022-07-27 17:04:47 +03:00 committed by Ryan Pavlik
parent ee450e6f29
commit 33d302d912
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -175,10 +175,10 @@ arch:rolling:container_prep:
inherit: inherit:
default: false default: false
variables: variables:
MONADO_WIN_BASE_TAG: "20220518.0" MONADO_WIN_BASE_TAG: "20220727.0"
MONADO_WIN_MAIN_TAG: "20220520.0" MONADO_WIN_MAIN_TAG: "20220727.0"
MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base" MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base"
MONADO_MAIN_IMAGE_PATH: "win2019/vs2022" MONADO_MAIN_IMAGE_PATH: "win2022/vs2022"
.monado.variables.windows:vs2022: .monado.variables.windows:vs2022:
inherit: inherit:
@ -197,7 +197,7 @@ arch:rolling:container_prep:
default: false default: false
tags: tags:
- windows - windows
- "1909" - "2022"
- shell - shell
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
@ -238,7 +238,7 @@ win:container_prep:
.monado.image.windows: .monado.image.windows:
tags: tags:
- windows - windows
- "1909" - "2022"
- docker - docker
extends: extends:
- .monado.variables.windows:vs2022 - .monado.variables.windows:vs2022
@ -621,4 +621,4 @@ pages:
- mv repo public/apt - mv repo public/apt
artifacts: artifacts:
paths: paths:
- public - public

12
.gitlab-ci/win_containers.yml
View file

@ -9,10 +9,10 @@
inherit: inherit:
default: false default: false
variables: variables:
MONADO_WIN_BASE_TAG: "20220518.0" MONADO_WIN_BASE_TAG: "20220727.0"
MONADO_WIN_MAIN_TAG: "20220520.0" MONADO_WIN_MAIN_TAG: "20220727.0"
MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base" MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base"
MONADO_MAIN_IMAGE_PATH: "win2019/vs2022" MONADO_MAIN_IMAGE_PATH: "win2022/vs2022"
.monado.variables.windows:vs2022: .monado.variables.windows:vs2022:
inherit: inherit:
@ -31,7 +31,7 @@
default: false default: false
tags: tags:
- windows - windows
- "1909" - "2022"
- shell - shell
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
@ -72,7 +72,7 @@ win:container_prep:
.monado.image.windows: .monado.image.windows:
tags: tags:
- windows - windows
- "1909" - "2022"
- docker - docker
extends: extends:
- .monado.variables.windows:vs2022 - .monado.variables.windows:vs2022

2
.gitlab-ci/windows/Dockerfile.vs2022
View file

@ -6,7 +6,7 @@
# escape=` # escape=`
# FROM mcr.microsoft.com/windows:2004 # FROM mcr.microsoft.com/windows:2004
FROM mcr.microsoft.com/windows/servercore:ltsc2019 FROM mcr.microsoft.com/windows/server:ltsc2022
# Make sure any failure in PowerShell scripts is fatal # Make sure any failure in PowerShell scripts is fatal
SHELL ["powershell", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"] SHELL ["powershell", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"]