From a995f24358da0de02821907e8e40f7bcb2bad6d8 Mon Sep 17 00:00:00 2001
From: Tsvetomir Tsonev <cvetomirconev@gmail.com>
Date: Thu, 7 Oct 2021 11:46:19 +0300
Subject: [PATCH] chore: run publish workflow from set branch

---
 .github/workflows/ff-master.sh | 16 ++++------------
 .github/workflows/publish.yml  |  1 -
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ff-master.sh b/.github/workflows/ff-master.sh
index c14a078..7db4773 100755
--- a/.github/workflows/ff-master.sh
+++ b/.github/workflows/ff-master.sh
@@ -1,20 +1,12 @@
 #!/usr/bin/env bash
-
 set -o verbose
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
+set -o errexit
 
-if [ "$BRANCH" != "master" ]; then
-    echo "Refusing to release from $BRANCH. This script should be running in master."
-    exit 1
-fi
+git checkout master
 
-echo Fast-forwarding master to develop
-set -o errexit
-git fetch --quiet
-git reset --hard origin/master
+echo "Fast-forwarding master to develop"
 git merge --ff-only --quiet origin/develop
-set +o errexit
 
-echo Pushing master
+echo "Pushing master"
 git push origin master
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ddbf148..8567dcd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,7 +14,6 @@ jobs:
       - name: Check out master
         uses: actions/checkout@v2
         with:
-          ref: master
           fetch-depth: 0 # Fetch all branches
           token: ${{ secrets.GH_TOKEN }}