diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90e166f31..5a27240f2 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