jaseg/stm32square
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do_release.sh: fix branching logic

Browse source
This commit is contained in:
jaseg 2020-11-18 13:42:45 +01:00
parent ae624f87c1
commit 31f91a75a4
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/do_release.sh
View file

@ -15,8 +15,9 @@ fi
TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)}
git checkout release
make clean all
git merge -X theirs $SOURCE_BRANCH
make clean all
git add svd mx_mcu_db prog_db chip_db
git commit --allow-empty -m "STM32Square Auto-Release $TIMESTAMP