ci: Install Media Foundations on the windows container
authorJordan Petridis <jordan@centricular.com>
Tue, 22 Mar 2022 10:17:33 +0000 (12:17 +0200)
committerJordan Petridіs <jpetridis@gnome.org>
Wed, 18 May 2022 09:14:08 +0000 (09:14 +0000)
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/2395>

.gitlab-ci.yml
ci/docker/windows/Dockerfile

index bcc3005..ca85416 100644 (file)
@@ -26,7 +26,7 @@ variables:
   ###
   FEDORA_TAG:  '2022-03-14.0'
   INDENT_TAG: '2022-03-07.1'
-  WINDOWS_TAG: "2022-04-26.0"
+  WINDOWS_TAG: "2022-05-09.0"
 
   GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
   FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
@@ -180,7 +180,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")
@@ -208,7 +208,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")
@@ -371,7 +371,7 @@ build clang fedora x86_64:
   tags:
     - 'docker'
     - 'windows'
-    - '1809'
+    - '2022'
   needs:
     - "windows amd64 docker"
   timeout: '45min'
index 83fbca5..c38ac70 100644 (file)
@@ -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'))