[gegl] gitlab-ci: pass noconfirm to pacman
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] gitlab-ci: pass noconfirm to pacman
- Date: Thu, 16 Dec 2021 01:50:39 +0000 (UTC)
commit 675838dca3c80dbdd32fd58e1656bb51be2cdb90
Author: Øyvind Kolås <pippin gimp org>
Date: Thu Dec 16 02:50:34 2021 +0100
gitlab-ci: pass noconfirm to pacman
.gitlab-ci.yml | 6 +++---
meson.build | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ea4f3dd2..e2f7ae616 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ 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-20210214.0.15477" > Dockerfile
- - echo "RUN pacman -Sy archlinux-keyring && pacman -Syu --noconfirm --ignore glibc --needed git
base-devel ccache meson lcms2 gobject-introspection vala pacman-contrib && pacman -Scc " >> Dockerfile
+ - echo "RUN pacman -Sy --noconfirm archlinux-keyring && pacman -Syu --noconfirm --ignore glibc --needed
git base-devel ccache meson lcms2 gobject-introspection vala pacman-contrib && pacman -Scc " >> 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 +40,7 @@ build-image:
GIT_DEPTH: "5"
CCACHE_MAXSIZE: "32Mi"
before_script:
- - pacman -Sy archlinux-keyring
+ - pacman -Sy --noconfirm archlinux-keyring
- 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
@@ -76,7 +76,7 @@ babl-master:
paths:
- _build/meson-logs/*
before_script:
- - pacman -Sy archlinux-keyring
+ - pacman -Sy --noconfirm archlinux-keyring
- pacman -Syu --ignore glibc --noconfirm --needed
base-devel ccache meson
asciidoc
diff --git a/meson.build b/meson.build
index f2d5de330..3fa477aaa 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('gegl',
'c', 'cpp',
license: 'GPL3+',
- version: '0.4.32',
+ version: '0.4.33',
# when meson version passes 0.53.0 remove alternate build summary
meson_version: '>=0.50.0',
default_options: [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]