diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d91dc1b..c0a1fef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,15 +69,14 @@ build-fedora-container: # We also don't need a CONTEXT_DIR var as its also # hardcoded to be windows-docker/ DOCKERFILE: 'ci/windows-docker/Dockerfile' - GST_UPSTREAM_BRANCH: 'main' + GST_UPSTREAM_BRANCH: '1.22' tags: - 'windows' - 'shell' - '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", "RUST_VERSION=$RUST_VERSION") - + - $DOCKER_BUILD_ARGS = @("--build-arg", "DEFAULT_GST_BRANCH=$GST_UPSTREAM_BRANCH", "--build-arg", "RUST_VERSION=$RUST_VERSION") - "& ci/windows-docker/container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $RUST_IMAGE $RUST_UPSTREAM_IMAGE $DOCKERFILE" - | if (!($?)) { diff --git a/ci/images_template.yml b/ci/images_template.yml index bb2d0b3..53bada6 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,4 +1,4 @@ variables: - GST_RS_IMG_TAG: '2023-03-03.0' + GST_RS_IMG_TAG: '2023-04-12.0' GST_RS_STABLE: '1.67.0' GST_RS_MSRV: '1.63.0' diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile index a8d793d..ae0697b 100644 --- a/ci/windows-docker/Dockerfile +++ b/ci/windows-docker/Dockerfile @@ -6,7 +6,9 @@ FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-09-23.0-ma ENV ErrorActionPreference='Stop' SHELL ["powershell","-NoLogo", "-NonInteractive", "-Command"] -ARG DEFAULT_BRANCH="main" +ARG DEFAULT_GST_BRANCH="1.22" +ARG DEFAULT_GTK_BRANCH="4.8.2" +ARG DEFAULT_PANGO_BRANCH="1.50.14" ARG RUST_VERSION="invalid" RUN choco install -y pkgconfiglite nasm llvm diff --git a/ci/windows-docker/install_gst.ps1 b/ci/windows-docker/install_gst.ps1 index c5de874..56a9fb6 100644 --- a/ci/windows-docker/install_gst.ps1 +++ b/ci/windows-docker/install_gst.ps1 @@ -1,7 +1,7 @@ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; # Download gstreamer and all its subprojects -git clone -b $env:DEFAULT_BRANCH --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer.git C:\gstreamer +git clone -b $env:DEFAULT_GST_BRANCH --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer.git C:\gstreamer if (!$?) { Write-Host "Failed to clone gstreamer" Exit 1 diff --git a/ci/windows-docker/install_gtk.ps1 b/ci/windows-docker/install_gtk.ps1 index 2eb8d0a..561e337 100644 --- a/ci/windows-docker/install_gtk.ps1 +++ b/ci/windows-docker/install_gtk.ps1 @@ -3,7 +3,7 @@ $env:MESON_ARGS = "--prefix=C:\gst-install\" # Download gtk and all its subprojects -git clone -b 4.8.2 --depth 1 https://gitlab.gnome.org/gnome/gtk.git C:\gtk +git clone -b $env:DEFAULT_GTK_BRANCH --depth 1 https://gitlab.gnome.org/gnome/gtk.git C:\gtk if (!$?) { Write-Host "Failed to clone gtk" Exit 1 diff --git a/ci/windows-docker/install_pango.ps1 b/ci/windows-docker/install_pango.ps1 index 48848f2..ac34be3 100644 --- a/ci/windows-docker/install_pango.ps1 +++ b/ci/windows-docker/install_pango.ps1 @@ -3,7 +3,7 @@ $env:MESON_ARGS = "--prefix=C:\gst-install\ --wrap-mode=forcefallback" # Download pango all its subprojects -git clone -b 1.50.14 --depth 1 https://gitlab.gnome.org/gnome/pango.git C:\pango +git clone -b $env:DEFAULT_PANGO_BRANCH --depth 1 https://gitlab.gnome.org/gnome/pango.git C:\pango if (!$?) { Write-Host "Failed to clone pango" Exit 1