[gegl] ci: unbreak archlinux-based CI
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] ci: unbreak archlinux-based CI
- Date: Sat, 20 Feb 2021 09:05:16 +0000 (UTC)
commit 939c4c1e2209318fef32c69f1ddaa320c07562ba
Author: Øyvind Kolås <pippin gimp org>
Date: Sat Feb 20 09:23:28 2021 +0100
ci: unbreak archlinux-based CI
Downgrade glibc to the pkgrel before arch linux made it depend on linux
kernel 4.4 [1], and ensure it's not upgraded - following the lead of
babl.
https://github.com/archlinux/svntogit-packages/commit/893b1c268abc8822332655865e3d4546025a9b4b
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff76a0d0b..0f5a9a8c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ build-image:
- mkdir -p /kaniko/.docker
- echo
"{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}"
/kaniko/.docker/config.json
- echo "FROM archlinux/base:latest" > Dockerfile
- - echo "RUN pacman -Syu --noconfirm --needed git base-devel ccache meson lcms2 gobject-introspection
vala && pacman -Scc --noconfirm " >> Dockerfile
+ - echo "RUN pacman -U --noconfirm
https://archive.archlinux.org/packages/g/glibc/glibc-2.33-3-x86_64.pkg.tar.zst " >> Dockerfile
+ - echo "RUN pacman -Syu --noconfirm --ignore glibc --needed git base-devel ccache meson lcms2
gobject-introspection vala pacman-contrib && pacman -Scc --noconfirm " >> Dockerfile
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination
$CI_REGISTRY_IMAGE:ci-latest --cache=true --cache-ttl=120h
@@ -40,7 +41,8 @@ build-image:
GIT_DEPTH: "5"
CCACHE_MAXSIZE: "32Mi"
before_script:
- - pacman -Syu --noconfirm --needed git base-devel ccache meson lcms2 gobject-introspection vala
+ - pacman -U --noconfirm https://archive.archlinux.org/packages/g/glibc/glibc-2.33-3-x86_64.pkg.tar.zst
+ - pacman -Syu --ignore glibc --noconfirm --needed git base-devel ccache meson lcms2
gobject-introspection vala
- git clone --depth=$GIT_DEPTH https://gitlab.gnome.org/GNOME/babl.git _babl
- cd _babl
- ccache -z
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]