Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Seems like before_script in publish was overwriting cargo on pages job, so i just move it into the script itself

Browse Source
This commit is contained in:
Marcel Märtens 2022-04-24 19:48:27 +02:00
parent 731fd1021d
commit 0941dfffae
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab/CI/publish.gitlab-ci.yml
View File

@ -6,8 +6,6 @@
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: on_success when: on_success
- when: never - when: never
before_script:
- source "$CI_PROJECT_DIR/.gitlab/scripts/util.sh"
docker: docker:
extends: .publish extends: .publish
@ -25,6 +23,7 @@ docker:
- export container=docker - export container=docker
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- | - |
source "$CI_PROJECT_DIR/.gitlab/scripts/util.sh"
publishdockertag PUBLISH_DOCKER_TAG publishdockertag PUBLISH_DOCKER_TAG
if [ "${PUBLISH_DOCKER_TAG}" != "" ]; then if [ "${PUBLISH_DOCKER_TAG}" != "" ]; then
/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}/server-cli:${PUBLISH_DOCKER_TAG}" /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}/server-cli:${PUBLISH_DOCKER_TAG}"