diff options
| author | 唐浩 <[email protected]> | 2024-09-06 02:03:58 +0000 |
|---|---|---|
| committer | 唐浩 <[email protected]> | 2024-09-06 02:03:58 +0000 |
| commit | 96f56a72c3417f0a4e38258ca81769b83ad2df1f (patch) | |
| tree | 59a7825019c1018cad692cf483e1f731f4d5021b | |
| parent | 7f77e43894011882bb35ecffd6d65ca9a44bcff3 (diff) | |
Update .gitlab-ci.yml file
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0b32f9..d90d2c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,15 +86,15 @@ build_image: - chmod +x ./ci-scripts/replaceI18nsql.sh - ./ci-scripts/replaceI18nsql.sh - mvn clean install -Dxjar.password=$XJAR_PIN -Dxjar.excludes=/db/*,/static/**/*,/install/* -Dmaven.test.skip=true - - cd ./cn-admin/target - - go build xjar.go - - chmod +x xjar +# - cd ./cn-admin/target +# - go build xjar.go +# - chmod +x xjar - echo '提交的分支是' - echo $CI_COMMIT_REF_NAME - echo 'XJAR_PIN :' $XJAR_PIN - echo 'CNWEB_TAG:' $CNWEB_TAG - echo 'exec build_image' - - cd ../ && mvn package -Dxjar.password=$XJAR_PIN -Dmaven.test.skip=true docker:build -DpushImage -DdockerImageTags=$CNWEB_TAG -DdockerImageName=192.168.40.153:9080/cyber-narrator/cn-web-$CI_COMMIT_REF_NAME:$CNWEB_TAG + - mvn package -Dxjar.password=$XJAR_PIN -Dmaven.test.skip=true docker:build -DpushImage -DdockerImageTags=$CNWEB_TAG -DdockerImageName=192.168.40.153:9080/cyber-narrator/cn-web-$CI_COMMIT_REF_NAME:$CNWEB_TAG #when用于当前一阶段任务故障或者忽略故障的job任务，主要用于清理发生故障时的后续措施。 #可选项 #on_success - 默认参数，前一阶段任务成功时才执行 @@ -116,15 +116,15 @@ build_release_image: - chmod +x ./ci-scripts/replaceI18nsql.sh - ./ci-scripts/replaceI18nsql.sh - mvn clean install -Dxjar.password=$XJAR_PIN -Dxjar.excludes=/db/*,/static/**/*,/install/* -Dmaven.test.skip=true - - cd ./cn-admin/target - - go build xjar.go - - chmod +x xjar +# - cd ./cn-admin/target +# - go build xjar.go +# - chmod +x xjar - echo 'tag名称是' - echo $CI_COMMIT_TAG - echo '提交的版本是' - echo $CI_COMMIT_REF_NAME - echo 'exec build_image' - - cd ../ && mvn package -Dxjar.password=$XJAR_PIN -Dmaven.test.skip=true docker:build -DpushImage -DdockerImageTags=$CNWEB_TAG -DdockerImageName=192.168.40.153:9080/cyber-narrator/cn-web:$CI_COMMIT_TAG + - mvn package -Dxjar.password=$XJAR_PIN -Dmaven.test.skip=true docker:build -DpushImage -DdockerImageTags=$CNWEB_TAG -DdockerImageName=192.168.40.153:9080/cyber-narrator/cn-web:$CI_COMMIT_TAG only: - tags tags: |