Merge branch...

Merge branch '6299-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines' into '1.5-dev'

Resolve "Adapt the ci to the reorganisation of the dev-tools and fixing the trigger downstream pipelines"

See merge request fusiondirectory/fd!1053

.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