From 5a25b0db6f6eca6b4300a5f15568fe6d97c734f0 Mon Sep 17 00:00:00 2001 From: Pau Date: Sun, 31 May 2020 11:45:30 +0200 Subject: [PATCH] Added fallback github deploy key --- docs/docusaurus.md | 2 +- mdoc-sbt/src/main/scala/mdoc/DocusaurusPlugin.scala | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/docusaurus.md b/docs/docusaurus.md index 828b7bb22..3cd00c307 100644 --- a/docs/docusaurus.md +++ b/docs/docusaurus.md @@ -134,7 +134,7 @@ https://travis-ci.org/scalameta/mdoc/settings. Add the following values: -- `GITHUB_DEPLOY_KEY`: the base64 encoded secret key. Note, the secret key is +- `GITHUB_DEPLOY_KEY` or `DEPLOY_KEY`: the base64 encoded secret key. Note, the secret key is the file without the `.pub` extension ```sh # macOS diff --git a/mdoc-sbt/src/main/scala/mdoc/DocusaurusPlugin.scala b/mdoc-sbt/src/main/scala/mdoc/DocusaurusPlugin.scala index 04c30f1f2..7a21554ae 100644 --- a/mdoc-sbt/src/main/scala/mdoc/DocusaurusPlugin.scala +++ b/mdoc-sbt/src/main/scala/mdoc/DocusaurusPlugin.scala @@ -56,6 +56,7 @@ object DocusaurusPlugin extends AutoPlugin { |set -eu | |set-up-ssh() { + | KEY=$1 | echo "Setting up ssh..." | mkdir -p $HOME/.ssh | ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts @@ -63,16 +64,18 @@ object DocusaurusPlugin extends AutoPlugin { | git config --global user.email "${MDOC_EMAIL:-mdoc@docusaurus}" | git config --global push.default simple | DEPLOY_KEY_FILE=$HOME/.ssh/id_rsa - | echo "$GITHUB_DEPLOY_KEY" | base64 --decode > ${DEPLOY_KEY_FILE} + | echo "$KEY" | base64 --decode > ${DEPLOY_KEY_FILE} | chmod 600 ${DEPLOY_KEY_FILE} | eval "$(ssh-agent -s)" | ssh-add ${DEPLOY_KEY_FILE} |} - |DEPLOY_KEY=${GITHUB_DEPLOY_KEY:-} | - |if [[ -n "$DEPLOY_KEY" ]]; then - | set-up-ssh - |fi + | if [[ -n "${GITHUB_DEPLOY_KEY:-}" ]]; then + | set-up-ssh ${GITHUB_DEPLOY_KEY} + | elif [[ -n "${DEPLOY_KEY:-}" ]]; then + | echo "Using fallback env var DEPLOY_KEY." + | set-up-ssh ${DEPLOY_KEY} + | fi | |yarn install |USE_SSH=true yarn publish-gh-pages