From ab513828ac4c06de9d79b7876394f6b723fc7dcf Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Tue, 20 Sep 2022 08:47:11 -0500
Subject: [PATCH] ci: Bump templates commit, and re-gen all Linux containers.

---
 .gitlab-ci.yml        | 14 +++++++-------
 .gitlab-ci/config.yml | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 188e078c7..37bcfc024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@
 variables:
   FDO_UPSTREAM_REPO: monado/monado
 
-.templates_sha: &templates_sha 34039cd573a2df832d465bc9e4c5f543571f5241
+.templates_sha: &templates_sha d5aa3941aa03c2f716595116354fb81eb8012acb
 
 include:
   # Debian
@@ -30,32 +30,32 @@ include:
 .monado.variables.debian:bullseye:
   variables:
     FDO_DISTRIBUTION_VERSION: "bullseye"
-    FDO_DISTRIBUTION_TAG: "2022-09-19.1"
+    FDO_DISTRIBUTION_TAG: "2022-09-20.1"
 
 # Variables for build and usage of Debian bullseye-ndk image
 .monado.variables.debian:bullseye-ndk:
   variables:
     FDO_DISTRIBUTION_VERSION: "bullseye"
-    FDO_DISTRIBUTION_TAG: "2022-07-25.0"
+    FDO_DISTRIBUTION_TAG: "2022-09-20.0"
     FDO_REPO_SUFFIX: ndk
 
 # Variables for build and usage of Ubuntu focal image
 .monado.variables.ubuntu:focal:
   variables:
     FDO_DISTRIBUTION_VERSION: "20.04"
-    FDO_DISTRIBUTION_TAG: "2022-07-25.1"
+    FDO_DISTRIBUTION_TAG: "2022-09-20.0"
 
 # Variables for build and usage of Ubuntu jammy image
 .monado.variables.ubuntu:jammy:
   variables:
     FDO_DISTRIBUTION_VERSION: "22.04"
-    FDO_DISTRIBUTION_TAG: "2022-07-25.0"
+    FDO_DISTRIBUTION_TAG: "2022-09-20.0"
 
 # Variables for build and usage of Arch rolling image
 .monado.variables.arch:rolling:
   variables:
     FDO_DISTRIBUTION_VERSION: "rolling"
-    FDO_DISTRIBUTION_TAG: "2022-07-25.0"
+    FDO_DISTRIBUTION_TAG: "2022-09-20.0"
 
 stages:
   - container_prep
@@ -621,4 +621,4 @@ pages:
     - mv repo public/apt
   artifacts:
     paths:
-      - public
+      - public
\ No newline at end of file
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 52297f880..9ed3809bb 100644
--- a/.gitlab-ci/config.yml
+++ b/.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: 34039cd573a2df832d465bc9e4c5f543571f5241
+fdo_ci_templates_sha: d5aa3941aa03c2f716595116354fb81eb8012acb
 
 # These are a mapping, instead of a list/array, so we can merge.
 .default_debian_packages:
@@ -69,7 +69,7 @@ distributions:
       # This image does some extra work.
       - codename: bullseye
         script: i386_and_proclamation_container_prep.sh
-        tag: "2022-09-19.1"
+        tag: "2022-09-20.1"
         deb_version_suffix: bpo11
         packages:
           <<: *default_debian_packages
@@ -116,7 +116,7 @@ distributions:
         distro_version: bullseye
         repo_suffix: ndk
         script: android_container_prep.sh
-        tag: "2022-07-25.0"
+        tag: "2022-09-20.0"
         # This must match ext.sharedTargetSdk in build.gradle
         android_compile_sdk: 31
         # This must match buildscript.ext.buildToolsVersion in build.gradle
@@ -171,7 +171,7 @@ distributions:
       # LTS
       - codename: focal
         distro_version: "20.04"
-        tag: "2022-07-25.1"
+        tag: "2022-09-20.0"
         deb_version_suffix: ubuntu2004
         packages:
           <<: *default_debian_packages
@@ -182,7 +182,7 @@ distributions:
 
       - codename: jammy
         distro_version: "22.04"
-        tag: "2022-07-25.0"
+        tag: "2022-09-20.0"
         deb_version_suffix: ubuntu2204
         packages:
           <<: *default_debian_packages
@@ -195,7 +195,7 @@ distributions:
   - name: arch
     images:
       - codename: rolling
-        tag: "2022-07-25.0"
+        tag: "2022-09-20.0"
         packages:
           git:
           gcc: