[babl/barthalion/ci-fix] ci: Unbreak archlinux-based CI




commit 3544ea34719a93e45ab155d1d33328cdd1c39f98
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Fri Feb 19 10:40:48 2021 +0100

    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 f98bb7b71..4b160d054 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 https://archive.archlinux.org/packages/g/glibc/glibc-2.33-3-x86_64.pkg.tar.zst
+    - pacman -Syu --noconfirm --needed --cachedir $PACMAN_CACHE --ignorepkg 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:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]