Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
6ac0889d
by Tony CHEMIT at 2024-12-12T17:48:03+00:00
1 changed file:
Changes:
| ... | ... | @@ -21,11 +21,11 @@ cache: |
| 21 | 21 | - ${REPOSITORY_CACHE_DIR}
|
| 22 | 22 | - ${GITLAB_CACHE_DIR}
|
| 23 | 23 | - ${SITE_CACHE_DIR}
|
| 24 | - - "${BUILD_DIR}/observe/target/*.zip"
|
|
| 25 | - - "${BUILD_DIR}/observe/target/*.war"
|
|
| 24 | + - "${BUILD_DIR}/.git/observe/target/*.zip"
|
|
| 25 | + - "${BUILD_DIR}/.git/observe/target/*.war"
|
|
| 26 | 26 | |
| 27 | 27 | .stage_docker: &stage_docker
|
| 28 | - stage: .pre
|
|
| 28 | + stage: .post
|
|
| 29 | 29 | .stage_build: &stage_build
|
| 30 | 30 | stage: Build
|
| 31 | 31 | .stage_test: &stage_test
|
| ... | ... | @@ -100,7 +100,7 @@ trigger-make-release: |
| 100 | 100 | |
| 101 | 101 | .automatic: &automatic
|
| 102 | 102 | rules:
|
| 103 | - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
|
|
| 103 | + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^feature/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
|
|
| 104 | 104 | - if: $CI_PIPELINE_SOURCE != 'trigger'
|
| 105 | 105 | |
| 106 | 106 | build:
|
| ... | ... | @@ -136,7 +136,7 @@ release-publish-site: |
| 136 | 136 | |
| 137 | 137 | .manual: &manual
|
| 138 | 138 | rules:
|
| 139 | - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
|
|
| 139 | + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^feature/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/
|
|
| 140 | 140 | when: manual
|
| 141 | 141 | |
| 142 | 142 | create-docker:
|