From c5dfc8795369abadf8489454b63add14c68fb60d Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Mon, 19 Aug 2024 21:10:07 +0530
Subject: [PATCH] ci: Bump linux image tag, and make a separate tag for windows

It is fairly common to rebuild only the linux or windows image. This
avoids needless rebuilds and then (v slow) downloads into the docker
cache of runners.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1500>
---
 .gitlab-ci.yml         | 11 +++++++----
 ci/images_template.yml |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c73375c48..af16805fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,9 @@
 # - setting it to the current date and the version suffix to 0
 # - incrementing the version suffix
 #
+# Same for GST_RS_IMG_WINDOWS_TAG. There's a separate tag for it to cater for
+# image-only updates that only affect Windows or only Linux.
+#
 # After each update commit your changes and push to your personal repo.
 # After review and ci approval merge the branch as usual.
 #
@@ -44,10 +47,10 @@ variables:
   FDO_UPSTREAM_REPO: gstreamer/gstreamer-rs
 
   # DIY CI-templates like setup for windows
-  WINDOWS_RUST_MINIMUM_IMAGE: "$CI_REGISTRY_IMAGE/windows:$GST_RS_IMG_TAG-main-$GST_RS_MSRV"
-  WINDOWS_RUST_MINIMUM_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows:$GST_RS_IMG_TAG-main-$GST_RS_MSRV"
-  WINDOWS_RUST_STABLE_IMAGE: "$CI_REGISTRY_IMAGE/windows:$GST_RS_IMG_TAG-main-$GST_RS_STABLE"
-  WINDOWS_RUST_STABLE_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows:$GST_RS_IMG_TAG-main-$GST_RS_STABLE"
+  WINDOWS_RUST_MINIMUM_IMAGE: "$CI_REGISTRY_IMAGE/windows:$GST_RS_IMG_WINDOWS_TAG-main-$GST_RS_MSRV"
+  WINDOWS_RUST_MINIMUM_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows:$GST_RS_IMG_WINDOWS_TAG-main-$GST_RS_MSRV"
+  WINDOWS_RUST_STABLE_IMAGE: "$CI_REGISTRY_IMAGE/windows:$GST_RS_IMG_WINDOWS_TAG-main-$GST_RS_STABLE"
+  WINDOWS_RUST_STABLE_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows:$GST_RS_IMG_WINDOWS_TAG-main-$GST_RS_STABLE"
 
   RUST_DOCS_FLAGS: "--cfg docsrs --extern-html-root-url=muldiv=https://docs.rs/muldiv/1.0.0/muldiv/ -Z unstable-options --generate-link-to-definition"
   NAMESPACE: gstreamer
diff --git a/ci/images_template.yml b/ci/images_template.yml
index fa19be9bf..f2da0e0cd 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -1,5 +1,6 @@
 variables:
-  GST_RS_IMG_TAG: "2024-08-19.1"
+  GST_RS_IMG_TAG: "2024-08-19.2"
+  GST_RS_IMG_WINDOWS_TAG: "2024-08-19.1"
   GST_RS_STABLE: "1.80.1"
   GST_RS_MSRV: "1.71.1"
   # The branch we use to build GStreamer from in the docker images