mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-01-31 11:00:26 +01:00
CI: Update Windows runners
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
parent
3f6400b8b9
commit
7a6e9f5beb
2 changed files with 4 additions and 4 deletions
|
|
@ -52,7 +52,7 @@ variables:
|
|||
# If you are hacking on them or need a them to rebuild, its enough
|
||||
# to change any part of the string of the image you want.
|
||||
###
|
||||
WINDOWS_TAG: "2022-02-06.2"
|
||||
WINDOWS_TAG: "2023-05-12.0"
|
||||
|
||||
UPSTREAM_BRANCH: 'master'
|
||||
UPSTREAM_REPO: 'dbus/dbus'
|
||||
|
|
@ -119,7 +119,7 @@ windows amd64 image:
|
|||
tags:
|
||||
- windows
|
||||
- shell
|
||||
- "1809"
|
||||
- "2022"
|
||||
script:
|
||||
# We need to pass an array and to resolve the env vars, so we can't use a variable:
|
||||
- $DOCKER_BUILD_ARGS = @("--build-arg", "DEFAULT_BRANCH=$UPSTREAM_BRANCH")
|
||||
|
|
@ -340,7 +340,7 @@ ubuntu jammy autotools:
|
|||
tags:
|
||||
- 'docker'
|
||||
- 'windows'
|
||||
- '1809'
|
||||
- '2022'
|
||||
needs:
|
||||
- "windows amd64 image"
|
||||
timeout: '2h'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# escape=`
|
||||
|
||||
FROM 'mcr.microsoft.com/windows/servercore:ltsc2019'
|
||||
FROM 'mcr.microsoft.com/windows/servercore:ltsc2022'
|
||||
|
||||
# Make sure any failure in PowerShell scripts is fatal
|
||||
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue