Skip to content

Commit 54baf2b

Browse files
committed
chores: Remove master merge check while adding dev tag
1 parent 23271fb commit 54baf2b

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

addDevTag

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
#!/bin/bash
22

3-
# check if we need to merge master into this branch------------
4-
if [[ $(git log origin/master ^HEAD) ]]; then
5-
echo "You need to merge master into this branch. Exiting"
6-
exit 1
7-
fi
8-
93
# get version------------
104
version=`cat setup.py | grep -e 'version='`
115
while IFS='"' read -ra ADDR; do
@@ -86,4 +80,4 @@ fi
8680

8781
git tag dev-v$version $commit_hash
8882

89-
git push --tags
83+
git push --tags

0 commit comments

Comments
 (0)