ci: Update version of ci-templates used and include workaround for CI policy change.

Also incorporate changes from !1719 into the templates

.gitlab-ci.yml

@@ -6,10 +6,17 @@
 # see .gitlab-ci/ci.template instead #
 ######################################
 
+# Detached MR pipelines, needed due to https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
+
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+
 variables:
   FDO_UPSTREAM_REPO: monado/monado
 
-.templates_sha: &templates_sha d5aa3941aa03c2f716595116354fb81eb8012acb
+.templates_sha: &templates_sha 9f0eb526291fe74651fe1430cbd2397f4c0a819b
 
 include:
   # Debian
@@ -127,12 +134,8 @@ arch:rolling:container_prep:
     changes:
       - .gitlab-ci/**/*
   variables:
-    # pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively
+    FDO_DISTRIBUTION_PACKAGES: 'base-devel bc bluez-libs boost check clang cmake diffutils doxygen eigen ffmpeg fmt gcc git glew glfw-x11 glslang glu graphviz gtest gtk3 hidapi libbsd libusb libxrandr mesa meson ninja opencv patch pipewire-jack pkgconfig python-attrs python-setuptools python3 qt5-base v4l-utils vulkan-headers vulkan-icd-loader wayland wget wireplumber'
-    # python-setuptools glu: librealsense
+    FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/install-arch-additional-deps.sh'
-    # glew boost gtest fmt bc: basalt-monado-git
-    # python-attrs: xr-hardware-git
-    FDO_DISTRIBUTION_PACKAGES: 'base-devel pipewire-jack wireplumber bluez-libs check clang cmake diffutils doxygen eigen ffmpeg gcc git glfw-x11 glslang graphviz gtk3 hidapi libusb libxrandr mesa ninja opencv patch pkgconfig python3 qt5-base v4l-utils vulkan-headers vulkan-icd-loader wget meson python-setuptools glu glew boost gtest fmt bc wayland libbsd python-attrs'
-    FDO_DISTRIBUTION_EXEC: bash .gitlab-ci/install-arch-additional-deps.sh
 
 ###
 # Container usage base jobs
@@ -626,4 +629,4 @@ pages:
     - mv repo public/apt
   artifacts:
     paths:
-      - public
+      - public

.gitlab-ci/README.md

@@ -1,7 +1,7 @@
 # CI and Generated Stuff Readme
 
 <!--
-# Copyright 2018-2022 Collabora, Ltd. and the Monado contributors
+# Copyright 2018-2023 Collabora, Ltd. and the Monado contributors
 #
 # SPDX-License-Identifier: CC0-1.0
 -->
@@ -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@d5aa3941aa03c2f716595116354fb81eb8012acb
+python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@9f0eb526291fe74651fe1430cbd2397f4c0a819b
 ```
 
 On Windows you will also need to have GNU make and busybox installed, such as with:

.gitlab-ci/ci.template

@@ -21,6 +21,13 @@ The following will update all files from templates:
 make -f .gitlab-ci/ci-scripts.mk
 #}
 
+# Detached MR pipelines, needed due to https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
+
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+
 variables:
   FDO_UPSTREAM_REPO: monado/monado
 

.gitlab-ci/config.yml

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2018-2022 Collabora, Ltd. and the Monado contributors
+# SPDX-FileCopyrightText: 2018-2023 Collabora, Ltd. and the Monado contributors
 
 # Please run the following from the repo root after modifying this file:
 #   make -f .gitlab-ci/ci-scripts.mk
 
-fdo_ci_templates_sha: d5aa3941aa03c2f716595116354fb81eb8012acb
+fdo_ci_templates_sha: 9f0eb526291fe74651fe1430cbd2397f4c0a819b
 
 # These are a mapping, instead of a list/array, so we can merge.
 .default_debian_packages:
@@ -195,35 +195,55 @@ distributions:
   - name: arch
     images:
       - codename: rolling
-        tag: "2022-09-20.0"
+        tag: "2023-03-13.2"
+        script: install-arch-additional-deps.sh
+        # pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively
+        # python-setuptools glu: librealsense
+        # glew boost gtest fmt bc: basalt-monado-git
+        # python-attrs: xr-hardware-git
         packages:
-          git:
+          base-devel:
-          gcc:
+          pipewire-jack:
+          wireplumber:
+          bluez-libs:
+          check:
           clang:
           cmake:
-          ninja:
-          pkgconfig:
-          python3:
           diffutils:
-          patch:
           doxygen:
-          graphviz:
           eigen:
+          ffmpeg:
+          gcc:
+          git:
+          glfw-x11:
+          glslang:
+          graphviz:
+          gtk3:
           hidapi:
+          libusb:
           libxrandr:
           mesa:
-          glslang:
+          ninja:
+          opencv:
+          patch:
+          pkgconfig:
+          python3:
+          qt5-base:
+          v4l-utils:
           vulkan-headers:
           vulkan-icd-loader:
-          check:
+          wget:
-          glfw-x11:
+          meson:
-          libusb:
+          python-setuptools:
-          opencv:
+          glu:
-          gtk3:
+          glew:
-          ffmpeg:
+          boost:
-          v4l-utils:
+          gtest:
-          qt5-base:
+          fmt:
-          bluez-libs:
+          bc:
+          wayland:
+          libbsd:
+          python-attrs:
         build_jobs:
           - name: "arch:cmake"