From 05379e6482759966c385a42c79df1c4ab8e0c434 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 14 Apr 2023 07:21:11 +0200
Subject: [PATCH] Fix pipeline
Squashed commit of the following:
commit c30dc88ce616c3d44eb8dfb16edb7dd9a5bda309
Author: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu Apr 13 23:10:16 2023 +0200
PIPELINE
commit 3a9298f8081747f6c6b90ca348a344a56f437087
Author: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu Apr 13 16:30:58 2023 +0200
PIPELINE
commit e7a0bed364f6da48de308caad9c7a5ef0e251b65
Author: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu Apr 13 16:02:20 2023 +0200
PIPELINE
commit c2716daea084be4aa485c2a49f72e6cc0652cf9d
Author: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu Apr 13 15:54:26 2023 +0200
PIPELINE
commit 1cb8836f8c818d68a1270fd4be6bff398816800b
Author: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu Apr 13 15:48:55 2023 +0200
PIPELINE
commit 9c261be1f208508a7b9fa7d6ab5c4457e91a699f
Author: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu Apr 13 15:37:25 2023 +0200
PIPELINE
---
.gitlab-ci.yml | 21 +++++++++++++--------
src/test/docker/Dockerfile | 3 +++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c38f5696..885b7914 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,10 @@ variables:
CPPINT: ""
MYSQLBACKEND: ""
+workflow:
+ rules:
+ - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_NAME != $CI_COMMIT_TAG
+
image: $CI_REGISTRY_IMAGE
stages:
- info
@@ -70,8 +74,11 @@ build-testenv:
image: docker:20.10
stage: setup
timeout: 3h
- only:
- - schedules
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "schedule"
+ - if: $CI_PIPELINE_SOURCE != "schedule"
+ changes:
+ - src/test/docker/Dockerfile
script:
- cd src/test/docker
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -136,9 +143,8 @@ trigger_inttest:
pages_prepare: &pages_prepare
tags: [ cached-dind ]
stage: deploy
- only:
- refs:
- - /^release-.*$/i
+ rules:
+ - if: $CI_COMMIT_REF_NAME =~ /^release-.*$/i
script:
- echo "Deploying..."
- make doc
@@ -148,6 +154,5 @@ pages_prepare: &pages_prepare
- public
pages:
<<: *pages_prepare
- only:
- refs:
- - main
+ rules:
+ - if: $CI_COMMIT_REF_NAME == 'main'
diff --git a/src/test/docker/Dockerfile b/src/test/docker/Dockerfile
index 1752f88c..19cf9dcd 100644
--- a/src/test/docker/Dockerfile
+++ b/src/test/docker/Dockerfile
@@ -3,6 +3,9 @@ RUN apt-get update && \
apt-get install -y \
git make mariadb-server maven openjdk-11-jdk-headless \
plantuml \
+ libtiff5-dev libjpeg-dev libopenjp2-7-dev zlib1g-dev \
+ libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
+ libharfbuzz-dev libfribidi-dev libxcb1-dev \
python3-pip screen libpam0g-dev unzip curl shunit2 \
python3-sphinx
--
GitLab