diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d97c0084548eb9446c28e8d89f58e8f298a639d3..a08efef7a6fbf3ba19053d16a4fc0df06ffcb3d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,12 +15,13 @@ build-dev: - echo $CI_PIPELINE_SOURCE - echo $CI_COMMIT_TITLE - echo $CI_COMMIT_SHORT_SHA - - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA + - echo "VUE_APP_VERSION_LABEL=MERGE $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_COMMIT_SHORT_SHA $CI_COMMIT_TITLE)" + - echo $CI_OPEN_MERGE_REQUESTS - |- if [[ $CI_PIPELINE_SOURVE == "merge_request_event" ]]; then - echo "VUE_APP_VERSION_LABEL=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" >> .env.dev_server + echo "VUE_APP_VERSION_LABEL=MERGE $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_COMMIT_TITLE)" >> .env.dev_server else - echo "VUE_APP_VERSION_LABEL=$CI_COMMIT_BRANCH" >> .env.dev_server + echo "VUE_APP_VERSION_LABEL=BRANCH $CI_COMMIT_BRANCH" >> .env.dev_server fi - npm install --progress=false - npm run build -- --mode dev_server