diff options
| author | jaseg <git@jaseg.de> | 2020-11-18 13:32:21 +0100 |
|---|---|---|
| committer | jaseg <git@jaseg.de> | 2020-11-18 13:32:21 +0100 |
| commit | 51987e1e3b00f89af3c0e72ea8ad760284dc8b84 (patch) | |
| tree | 161b9651e4b47565084a73849b89cd48a803c8d2 | |
| parent | 04f46bfc5bd4643207cfd4a6eab725d8241962b7 (diff) | |
| download | stm32square-51987e1e3b00f89af3c0e72ea8ad760284dc8b84.tar.gz stm32square-51987e1e3b00f89af3c0e72ea8ad760284dc8b84.tar.bz2 stm32square-51987e1e3b00f89af3c0e72ea8ad760284dc8b84.zip | |
Fix do_release.sh
| -rw-r--r-- | tools/do_release.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/do_release.sh b/tools/do_release.sh index e282a55..f510709 100644 --- a/tools/do_release.sh +++ b/tools/do_release.sh @@ -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 |