Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike.gerwitz@ryansg.com>2021-10-07 13:18:25 -0400
committerMike Gerwitz <mike.gerwitz@ryansg.com>2021-10-07 13:25:55 -0400
commitf0ca3e88b7b7e57811133218158fc560df8209ba (patch)
tree9cfa851b20403fa1f55967bffc4aedd7664c1396 /.gitlab-ci.yml
parent072a501ed533ed99b116f1f2b06eb22c489bbb96 (diff)
downloadtame-f0ca3e88b7b7e57811133218158fc560df8209ba.tar.gz
tame-f0ca3e88b7b7e57811133218158fc560df8209ba.tar.bz2
tame-f0ca3e88b7b7e57811133218158fc560df8209ba.zip
.gitlab-ci.yml: Remove unnecessary SSH auth
We're using token-based auth now, using a project access token.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a50426..6eec732 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,14 +56,12 @@ pages:
ci:merge:
stage: deploy
script:
- - eval $(ssh-agent -s)
- - ssh-add <(echo "$SSH_PRIVATE_KEY")
- git config user.email "gitlab-ci@localhost"
- git config user.name "GitLab CI"
- git checkout main
- git reset --hard origin/main
- git merge --ff origin/stage
- # Should trigger pipeline
+ # This will trigger main pipeline after pushing
- git push http://ci:$STAGE_MERGE_ACCESS_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH.git HEAD:main
only:
- stage