From 3cb225c5c5f76bde36c65d9167738f1c806c0754 Mon Sep 17 00:00:00 2001
From: Jean-Matthieu Etancelin <jean-matthieu.etancelin@univ-pau.fr>
Date: Thu, 23 Feb 2023 15:23:00 +0100
Subject: [PATCH] get CI test back alive
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4613efe14..0620bf1ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,8 +72,7 @@ test:jammy:
image: gricad-registry.univ-grenoble-alpes.fr/particle_methods/hysop:jammy
stage: test
script:
- - "echo ok"
-# - "bash ci/scripts/test.sh $CI_PROJECT_DIR/install/gcc $CI_PROJECT_DIR/hysop $CI_PROJECT_DIR/cache"
+ - "bash ci/scripts/test.sh $CI_PROJECT_DIR/install/gcc $CI_PROJECT_DIR/hysop $CI_PROJECT_DIR/cache"
dependencies:
- install:jammy
cache:
@@ -84,8 +83,9 @@ test:jammy:
# Trigger the CI of hysop-doc project to re-build online documentation (user+generated)
onlinedocupdate:
stage: doc
- # rules:
- # - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+ rules:
+ - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
trigger:
project: particle_methods/hysop-doc
branch: main
+ allow_failure: true
--
GitLab