From 51987e1e3b00f89af3c0e72ea8ad760284dc8b84 Mon Sep 17 00:00:00 2001 From: jaseg Date: Wed, 18 Nov 2020 13:32:21 +0100 Subject: Fix do_release.sh --- tools/do_release.sh | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit