From 6e8a95bae475b9a548e13b132e4c6a079aa4a4b6 Mon Sep 17 00:00:00 2001 From: Zak Timson Date: Tue, 3 May 2022 18:04:53 +0000 Subject: [PATCH] Removed need for production branch --- .gitlab/.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 390d0ac..e751a1d 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -73,7 +73,7 @@ tag: entrypoint: [ "" ] cache: [ ] before_script: - - git remote set-url origin "http://gitlab-ci-token:$DEPLOY_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH.git" + - git remote set-url origin http://gitlab-ci-token:$DEPLOY_TOKEN@gitlab.psdcitywide.com/$CI_PROJECT_PATH.git script: - VERSION=$(cat package.json | grep version | grep -Eo ':.+' | grep -Eo '[[:alnum:]\.\/\-]+') - git tag -f $VERSION $CI_COMMIT_SHA @@ -91,4 +91,4 @@ production: name: Production url: https://zakscode.com rules: - - if: '$CI_COMMIT_BRANCH == "production" && $CI_DEPLOY_FREEZE == null' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_DEPLOY_FREEZE == null'