mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-26 02:00:33 +00:00
ci: Install Media Foundations on the windows container
In order to do this, we need to switch to the Server container image, instead of the ServerCore we were using till now. This image also only has Server2022 base variants. This is a continuation of: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1783 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2808>
This commit is contained in:
parent
cdb757ca47
commit
758492bb4d
2 changed files with 9 additions and 7 deletions
|
@ -27,7 +27,7 @@ variables:
|
|||
###
|
||||
FEDORA_TAG: '2021-12-03.1'
|
||||
INDENT_TAG: '2021-10-04.0'
|
||||
WINDOWS_TAG: "2022-01-26.3"
|
||||
WINDOWS_TAG: "2022-06-28.0-1.20"
|
||||
|
||||
GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
|
||||
FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
|
||||
|
@ -179,7 +179,7 @@ windows amd64 docker:
|
|||
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=$GST_UPSTREAM_BRANCH")
|
||||
|
@ -209,7 +209,7 @@ windows amd64 docker:
|
|||
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=$GST_UPSTREAM_BRANCH", "--build-arg", "BASE_IMAGE=$WINDOWS_IMAGE", "--build-arg", "RUST_VERSION=$RUST_VERSION")
|
||||
|
@ -384,7 +384,7 @@ build clang fedora x86_64:
|
|||
tags:
|
||||
- 'docker'
|
||||
- 'windows'
|
||||
- '1809'
|
||||
- '2022'
|
||||
needs:
|
||||
- "windows amd64 docker"
|
||||
timeout: '45min'
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
# escape=`
|
||||
|
||||
FROM 'mcr.microsoft.com/windows/servercore:ltsc2019'
|
||||
FROM 'mcr.microsoft.com/windows/server:ltsc2022'
|
||||
|
||||
# Make sure any failure in PowerShell scripts is fatal
|
||||
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
|
||||
# Make sure any failure in PowerShell is fatal
|
||||
ENV ErrorActionPreference='Stop'
|
||||
SHELL ["powershell","-NoLogo", "-NonInteractive", "-Command"]
|
||||
|
||||
RUN Install-WindowsFeature -Name Server-Media-Foundation
|
||||
|
||||
# Install Chocolatey
|
||||
RUN iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
|
||||
|
|
Loading…
Reference in a new issue