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

Fix do_release.sh

Browse source
This commit is contained in:
jaseg 2020-11-18 13:32:21 +01:00
parent 04f46bfc5b
commit 51987e1e3b
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/do_release.sh
View file

@ -1,5 +1,4 @@
#!/bin/sh
set -euo pipefail
SOURCE_BRANCH=$(git branch --show-current)
RELEASE_TRIGGER=${RELEASE_TRIGGER:-"Manual command-line makefile invocation"}
@ -15,7 +14,7 @@ fi
TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)}
git checkout release
#make clean
make clean all
git merge -X theirs $SOURCE_BRANCH
git add svd mx_mcu_db prog_db chip_db
git commit --allow-empty -m "STM32Square Auto-Release $TIMESTAMP