From cbdc554c5ab2f5b83188ffe3cf6c4fe50c111004 Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@fusiondirectory.org>
Date: Tue, 3 Oct 2023 12:59:09 +0000
Subject: [PATCH] Resolve "Adapt the ci to the reorganisation of the dev-tools
and fixing the trigger downstream pipelines"
---
.gitlab-ci.yml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23ce5faf9..a849dde0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ create_phpstan_rapport:
- test -d ../dev-tools/ && rm -Rf ../dev-tools/
- git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
- composer global require phpstan/phpstan=0.12.94
- - cp ../dev-tools/phpstan/fusiondirectory/1.4-dev/*.neon .
+ - cp ../dev-tools/phpstan/fusiondirectory/1.5/*.neon .
- /root/.composer/vendor/bin/phpstan analyse -c phpstan.neon
# fusiondirectory-update-locale
@@ -73,8 +73,7 @@ update-transifex:
build-tarballs:
stage: tarballs
only:
- variables:
- - $TARBALLS_TRIGGER_VERSION
+ - 1.5-dev
script:
- mkdir ../fusiondirectory-$VERSION/
- mv ./* ../fusiondirectory-$VERSION/
@@ -108,7 +107,7 @@ trigger-plugins:
BRANCH_BUILD_CENTOS_7: $BRANCH_BUILD_CENTOS_7
stage: trigger
only:
- - 1.4-dev
+ - 1.5-dev
trigger:
project: fusiondirectory/fd-plugins
branch: $CI_COMMIT_REF_NAME
--
GitLab