Skip to content
GitLab
Commit 40a59fbf authored by dockx thibault's avatar dockx thibault
Browse files

Merge branch 'dev' into '6241-private-form-must-not-be-related-to-the-plugin-invitations' 

# Conflicts:
#   .gitlab-ci.yml
parents c6d21df8 ce986a6a
dev 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 6 deletions
+5 -6
.gitlab-ci.yml
+ 5
− 6
View file @ 40a59fbf
...@@ -44,7 +44,7 @@ create_phpstan_rapport: ...@@ -44,7 +44,7 @@ create_phpstan_rapport:
- test -d ../fusiondirectory/ && rm -Rf ../fusiondirectory/ - test -d ../fusiondirectory/ && rm -Rf ../fusiondirectory/
- git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/fd.git ../fusiondirectory - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/fd.git ../fusiondirectory
- composer global require phpstan/phpstan=0.12.94 - composer global require phpstan/phpstan=0.12.94
- cp ../dev-tools/phpstan/fusiondirectory/1.4/*.neon . - cp ../dev-tools/phpstan/fusiondirectory/1.5/*.neon .
- /root/.composer/vendor/bin/phpstan analyse -c phpstan-plugins.neon - /root/.composer/vendor/bin/phpstan analyse -c phpstan-plugins.neon
# fusiondirectory-update-locale # fusiondirectory-update-locale
...@@ -52,7 +52,7 @@ fusiondirectory-update-locale: ...@@ -52,7 +52,7 @@ fusiondirectory-update-locale:
image: registry.fusiondirectory.org/fusiondirectory/fd/transifex-cli:buster image: registry.fusiondirectory.org/fusiondirectory/fd/transifex-cli:buster
stage: transifex stage: transifex
only: only:
- /^1.*$/ - dev
script: script:
- test -d ../dev-tools/ && rm -Rf ../dev-tools/ - test -d ../dev-tools/ && rm -Rf ../dev-tools/
- git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
...@@ -63,7 +63,7 @@ update-transifex: ...@@ -63,7 +63,7 @@ update-transifex:
image: registry.fusiondirectory.org/fusiondirectory/fd/transifex-cli:buster image: registry.fusiondirectory.org/fusiondirectory/fd/transifex-cli:buster
stage: transifex stage: transifex
only: only:
- /^1.*$/ - dev
script: script:
- test -d ../dev-tools/ && rm -Rf ../dev-tools/ - test -d ../dev-tools/ && rm -Rf ../dev-tools/
- git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
...@@ -75,8 +75,7 @@ update-transifex: ...@@ -75,8 +75,7 @@ update-transifex:
build-tarballs: build-tarballs:
stage: tarballs stage: tarballs
only: only:
variables: - dev
- $TARBALLS_TRIGGER_VERSION
script: script:
- mkdir ../fusiondirectory-plugins-$VERSION/ - mkdir ../fusiondirectory-plugins-$VERSION/
- mv ./* ../fusiondirectory-plugins-$VERSION/ - mv ./* ../fusiondirectory-plugins-$VERSION/
...@@ -104,7 +103,7 @@ build-release: ...@@ -104,7 +103,7 @@ build-release:
trigger-ci-debian-buster: trigger-ci-debian-buster:
stage: trigger stage: trigger
only: only:
- 1.4-dev - dev
variables: variables:
GROUP: "$GROUP" GROUP: "$GROUP"
BRANCH_CORE: "$CI_COMMIT_REF_NAME" BRANCH_CORE: "$CI_COMMIT_REF_NAME"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment