diff options
| author | Jordan Petridis <jordan@centricular.com> | 2022-03-22 12:17:33 +0200 |
|---|---|---|
| committer | Jordan PetridÑ–s <jpetridis@gnome.org> | 2022-05-18 09:14:08 +0000 |
| commit | 02c277258bfd61f34f76974d1dbd5d85df9a366f (patch) | |
| tree | cad8660f1878c9e022ae92bf012fb0fa33a759cf /.gitlab-ci.yml | |
| parent | 2b943597657c46ac11135ead4dd30db5fd565d50 (diff) | |
| download | gstreamer-02c277258bfd61f34f76974d1dbd5d85df9a366f.tar.gz | |
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/2395>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcc30057b6..ca854166f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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' |