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 <[email protected]>
luniehq · Jun 2, 2020 · 37709b6 · 37709b6
1 parent 742e6c7
commit 37709b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pending/ana_try-fix-publish-script 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
diff --git 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 "[email protected]"
     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
+    echo "No release detected, so not publishing"
+fi
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[Fixed] [#268](https://github.com/cosmos/lunie/pull/268) Fixes the publish script (I hope) @Bitcoinera