From ca81ffe22916d912cc66f17dd857579156772197 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski@gnome.org>
Date: Fri, 19 Feb 2021 10:40:48 +0100
Subject: [PATCH] ci: Unbreak archlinux-based CI

Recently Arch has changed its glibc package to require kernel
4.4[1] as a poor man's attempt to disable faccessat2 syscall that
is known to cause problems with old libseccomp and Docker. Downgrade
glibc to the pkgrel before the change and ensure it's not upgraded.

Additionally switch to the official Arch Linux image in the library
namespace. The base image has been deprecated.

[1] https://github.com/archlinux/svntogit-packages/commit/893b1c268abc8822332655865e3d4546025a9b4b
---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f98bb7b..89e1e3b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ cache:
 
 .build:
   stage: build
-  image: archlinux/base:latest
+  image: archlinux:latest
   variables:
     PACMAN_CACHE: $CI_PROJECT_DIR/_pacman_cache
   artifacts:
@@ -12,12 +12,14 @@ cache:
     paths:
       - _build/meson-logs
   before_script:
-    - pacman -Syu --noconfirm --needed --cachedir $PACMAN_CACHE
+    - pacman -U --noconfirm https://archive.archlinux.org/packages/g/glibc/glibc-2.33-3-x86_64.pkg.tar.zst
+    - pacman -Syu --noconfirm --needed --cachedir $PACMAN_CACHE --ignore glibc
         base-devel
         git
         gobject-introspection
         meson
         vala
+        pacman-contrib
         ${EXTRA_PKGS}
   script:
     - meson _build
@@ -33,7 +35,6 @@ cache:
     - ninja -C _build test
   after_script:
     # Remove all cached packages but the latest version
-    - pacman -S --noconfirm --cachedir $PACMAN_CACHE pacman-contrib
     - paccache -r -k1 --cachedir $PACMAN_CACHE
 
 latest-lcms:
-- 
2.30.2