From 37709b6635a28cdd72bee221c31d349ae7ea9961 Mon Sep 17 00:00:00 2001 From: Ana G <40721795+Bitcoinera@users.noreply.github.com> Date: Tue, 2 Jun 2020 19:52:41 +0200 Subject: [PATCH] Ana/try fix publish script (#268) * try fix publish script * changelog * revert script change * use same possible fix than in api Co-authored-by: MergeBack Lunie Bot --- pending/ana_try-fix-publish-script | 1 + scripts/publish.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 pending/ana_try-fix-publish-script diff --git a/pending/ana_try-fix-publish-script b/pending/ana_try-fix-publish-script new file mode 100644 index 0000000000..0074efe8f3 --- /dev/null +++ b/pending/ana_try-fix-publish-script @@ -0,0 +1 @@ +[Fixed] [#268](https://github.com/cosmos/lunie/pull/268) Fixes the publish script (I hope) @Bitcoinera \ No newline at end of file diff --git a/scripts/publish.sh b/scripts/publish.sh index ce1d6ba6c1..c990cf01ef 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -1,15 +1,15 @@ #!/bin/bash COMMIT_MESSAGE=$(git log --format=%B -n 1) -if [[ $COMMIT_MESSAGE == release* || $COMMIT_MESSAGE == "[Simsala] automatic release"* ]] +if [[ $COMMIT_MESSAGE == "release-"* || $COMMIT_MESSAGE == "[Simsala] automatic release"* ]] then echo "Publishing" git config user.email "bot@lunie.io" git config user.name "Publish Lunie Bot" - git remote add bot https://${GIT_BOT_TOKEN}@github.com/luniehq/lunie.git + git remote add bot https://${GIT_BOT_TOKEN}@github.com/luniehq/lunie-browser-extension.git git checkout master git pull - git merge origin/develop + git merge --no-edit origin/develop git push else - echo "No release detected so not publishing" -fi \ No newline at end of file + echo "No release detected, so not publishing" +fi