ci: bump our templates and ci-fairy version, some cleanup

.gitlab-ci.yml

@@ -18,7 +18,7 @@ variables:
 
 include:
   - project: "freedesktop/ci-templates"
-    ref: 7811ba9814a3bad379377241c6c6b62d78b20eac
+    ref: 185ede0e9b9b1924b92306ab8b882a6294e92613
     file:
       - "/templates/debian.yml"
       - "/templates/ubuntu.yml"
@@ -45,7 +45,7 @@ stages:
     - when: never
 
 
-# # #
+# # # 
 ###
 # Windows container-related jobs (prep and usage)
 
@@ -122,6 +122,8 @@ win:container_prep:
     - .build-rules
   image: $MONADO_IMAGE
 
+
+
 # Variables for build and usage of Debian bullseye image
 .monado.variables.debian:bullseye:
   variables:
@@ -153,6 +155,7 @@ win:container_prep:
     FDO_DISTRIBUTION_VERSION: "rolling"
     FDO_DISTRIBUTION_TAG: "2023-05-22.0"
 
+
 ###
 # Container prep jobs
 # Make Debian bullseye image

.gitlab-ci/README.md

@@ -16,7 +16,7 @@ You can install it with:
 
 <!-- do not break the following line, it is used in CI setup too, to make sure it works -->
 ```sh
-python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@9f0eb526291fe74651fe1430cbd2397f4c0a819b
+python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@185ede0e9b9b1924b92306ab8b882a6294e92613
 ```
 
 On Windows you will also need to have GNU make and busybox installed, such as with:

.gitlab-ci/config.yml

@@ -4,7 +4,7 @@
 # Please run the following from the repo root after modifying this file:
 #   make -f .gitlab-ci/ci-scripts.mk
 
-fdo_ci_templates_sha: 7811ba9814a3bad379377241c6c6b62d78b20eac
+fdo_ci_templates_sha: 185ede0e9b9b1924b92306ab8b882a6294e92613
 
 # These are a mapping, instead of a list/array, so we can merge.
 .default_debian_packages: