diff options
| author | 杨威 <[email protected]> | 2019-06-27 18:45:09 +0800 |
|---|---|---|
| committer | 杨威 <[email protected]> | 2019-06-27 18:45:09 +0800 |
| commit | 95276dd94d418a38524cdd5140beb59c23fb0a9e (patch) | |
| tree | 4921c81ea8d2e58fb4061334d61e0c7701841caa | |
| parent | 2c99289b7b7494cf5ad206a7988070bd27e768d4 (diff) | |
| parent | a3c2786b020b931c5a96e45169bff3887dd7a3b5 (diff) | |
Merge branch 'patch-1' into 'pangu_develop_parallel'
Update .gitlab-ci.yml
See merge request MESA_Platform/sapp!26
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de3f503..b94d02a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ build: BUILD_TYPE: "Debug" BUILD_PREFIX: "/opt/MESA/" only: - - tags + - pushes artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA" paths: @@ -40,7 +40,8 @@ release: tags: - share only: - - tags + - tags + - master script: - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $CI_PROJECT_NAME $CI_COMMIT_SHORT_SHA @@ -51,10 +52,11 @@ docker: tags: - share only: - - tags + - tags + - master script: - ls -l build - ls -l /tmp/ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build -t $IMAGE_TAG . - - docker push $IMAGE_TAG
\ No newline at end of file + - docker push $IMAGE_TAG
\ No newline at end of file |