From 3ef54c5c714a3481c3bb22a0d069ecf330dbcd63 Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Mon, 13 Feb 2023 16:50:36 +0530 Subject: [PATCH] debug: ssh key --- .woodpecker.yml | 2 +- Makefile | 1 + scripts/ci.sh | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ce6aa6d..a0f2fc7 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -9,4 +9,4 @@ pipeline: - make env - make - make ci-deploy - secrets: [ GITEA_WRITE_DEPLOY_KEY, LIBREPAGES_DEPLOY_SECRET ] + secrets: [ FORGEJO_WRITE_DEPLOY_KEY, LIBREPAGES_DEPLOY_SECRET ] diff --git a/Makefile b/Makefile index 6529e6a..f0451e0 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ ci-deploy: ## Deploy from CI/CD. Only call from within CI git config --global user.name "${CI_COMMIT_AUTHOR}" ./scripts/hugo.sh deploy librepages public "${CI_COMMIT_AUTHOR} <${CI_COMMIT_AUTHOR_EMAIL}>" ./scripts/ci.sh --init "$$FORGEJO_WRITE_DEPLOY_KEY" + cat /tmp/ci-ssh-id ./scripts/ci.sh --deploy ${LIBREPAGES_DEPLOY_SECRET} librepages ./scripts/ci.sh --clean diff --git a/scripts/ci.sh b/scripts/ci.sh index 46f2229..975cbdb 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -56,8 +56,7 @@ set_ssh_remote() { remote_hostname=$(echo $http_remote_url | cut -d '/' -f 3) repository_owner=$(echo $http_remote_url | cut -d '/' -f 4) repository_name=$(echo $http_remote_url | cut -d '/' -f 5) - ssh_remote="git@$remote_hostname:$repository_owner/$repository_name" - ssh_remote="git@git.batsense.net:mCaptcha/website.git" + ssh_remote="git@git.batsense.net:mcaptcha/website.git" git remote add $SSH_REMOTE_NAME $ssh_remote }