Commit f72062e1 authored by bmortier's avatar bmortier
Browse files

:handshake: fix(ci) change the ci due to the dev only branch and simplify it

Showing with 5 additions and 5 deletions
+5 -5
...@@ -7,7 +7,7 @@ stages: ...@@ -7,7 +7,7 @@ stages:
## Stage lint ## Stage lint
# PHP lint (stretch) # PHP lint
create_php_lint_rapport: create_php_lint_rapport:
image: registry.fusiondirectory.org/fusiondirectory/fd/phpcodesniffer-cli:buster image: registry.fusiondirectory.org/fusiondirectory/fd/phpcodesniffer-cli:buster
stage: lint stage: lint
...@@ -50,7 +50,7 @@ fusiondirectory-update-locale: ...@@ -50,7 +50,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
...@@ -61,7 +61,7 @@ update-transifex: ...@@ -61,7 +61,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
...@@ -73,7 +73,7 @@ update-transifex: ...@@ -73,7 +73,7 @@ update-transifex:
build-tarballs: build-tarballs:
stage: tarballs stage: tarballs
only: only:
- 1.5-dev - dev
script: script:
- mkdir ../fusiondirectory-$VERSION/ - mkdir ../fusiondirectory-$VERSION/
- mv ./* ../fusiondirectory-$VERSION/ - mv ./* ../fusiondirectory-$VERSION/
...@@ -107,7 +107,7 @@ trigger-plugins: ...@@ -107,7 +107,7 @@ trigger-plugins:
BRANCH_BUILD_CENTOS_7: $BRANCH_BUILD_CENTOS_7 BRANCH_BUILD_CENTOS_7: $BRANCH_BUILD_CENTOS_7
stage: trigger stage: trigger
only: only:
- 1.5-dev - dev
trigger: trigger:
project: fusiondirectory/fd-plugins project: fusiondirectory/fd-plugins
branch: $CI_COMMIT_REF_NAME branch: $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