Skip to content

Commit a995f24

Browse files
committed
chore: run publish workflow from set branch
1 parent 971c2fc commit a995f24

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

.github/workflows/ff-master.sh

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
2-
32
set -o verbose
4-
BRANCH=$(git rev-parse --abbrev-ref HEAD)
3+
set -o errexit
54

6-
if [ "$BRANCH" != "master" ]; then
7-
echo "Refusing to release from $BRANCH. This script should be running in master."
8-
exit 1
9-
fi
5+
git checkout master
106

11-
echo Fast-forwarding master to develop
12-
set -o errexit
13-
git fetch --quiet
14-
git reset --hard origin/master
7+
echo "Fast-forwarding master to develop"
158
git merge --ff-only --quiet origin/develop
16-
set +o errexit
179

18-
echo Pushing master
10+
echo "Pushing master"
1911
git push origin master
2012

.github/workflows/publish.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
- name: Check out master
1515
uses: actions/checkout@v2
1616
with:
17-
ref: master
1817
fetch-depth: 0 # Fetch all branches
1918
token: ${{ secrets.GH_TOKEN }}
2019

0 commit comments

Comments
 (0)