[gimp/temp/Jehan/test-CI-mypaint-brushes1: 2/2] Issue #3840: Arch added a mypaint-brushes1 package.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/temp/Jehan/test-CI-mypaint-brushes1: 2/2] Issue #3840: Arch added a mypaint-brushes1 package.
- Date: Sat, 24 Aug 2019 19:21:11 +0000 (UTC)
commit b194ce1e07b6d6fca30473a13ec4f34f0459d3e4
Author: Jehan <jehan girinstud io>
Date: Sat Aug 24 21:16:46 2019 +0200
Issue #3840: Arch added a mypaint-brushes1 package.
This is the base system for our CI, and the former mypaint-brushes
package got bumped to v2, which broke the build. Instead of rolling
back, they added a mypaint-brushes1 package. Let's rely on it instead of
installing it ourselves now.
.gitlab-ci.yml | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8afc374697..d877d856f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
image: archlinux/base:latest
stages:
- - mypaint-brushes
- babl
- gegl
- gimp
@@ -15,30 +14,6 @@ cache:
paths:
- _pacman_cache
-.mypaint-brushes-base:
- stage: mypaint-brushes
- artifacts:
- paths:
- - "${INSTALL_DIR}"
- variables:
- GIT_DEPTH: "5"
- before_script:
- - pacman -Syu --noconfirm --needed --cachedir "${PACMAN_CACHE}"
- git
- base-devel
- - git clone --branch=v1.3.x --depth="${GIT_DEPTH}" https://github.com/mypaint/mypaint-brushes.git
_mypaint-brushes
-
-mypaint-brushes-git:
- extends: .mypaint-brushes-base
- script:
- - cd _mypaint-brushes
- - ./autogen.sh
- - mkdir _build
- - cd _build
- - ../configure
- --prefix="${INSTALL_PREFIX}"
- - make install
-
.babl-base:
stage: babl
artifacts:
@@ -169,7 +144,7 @@ gegl-git:
libwmf
libxmu
libxpm
- mypaint-brushes
+ mypaint-brushes1
openexr
poppler-data
pygtk
@@ -206,7 +181,6 @@ gegl-git:
build-git-autotools:
extends: .gimp-autotools
dependencies:
- - mypaint-brushes-git
- babl-git
- gegl-git
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]