From 64485d7866331e1cfec48a585fad195e02204305 Mon Sep 17 00:00:00 2001 From: Distopico Vegan Date: Wed, 14 Nov 2018 00:38:07 -0500 Subject: [PATCH] ci add remote --- .gitlab-ci.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c232e36..cfdda004 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,13 +112,9 @@ release: script: - npm install -g semantic-release @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/exec @semantic-release/git @semantic-release/gitlab - semantic-release - - git remote update - - git fetch - - git branch -avv - - git checkout --track -b develop origin/develop - - git rebase master - - git show --summary - - git rebase origin/master - - git show --summary - - git push git@${GITLAB_URL}:${CI_PROJECT_PATH}.git develop + - git remote add upstream git@${GITLAB_URL}:${CI_PROJECT_PATH}.git + - git fetch upstream + - git checkout -b develop upstream/develop + - git rebase upstream/master + - git push upstream develop #- git push https://${GIT_CREDENTIALS}@${GITLAB_URL}/${CI_PROJECT_PATH}.git develop