diff options
| -rw-r--r-- | tools/do_release.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/do_release.sh b/tools/do_release.sh index 3bcacb1..ad7bba3 100644 --- a/tools/do_release.sh +++ b/tools/do_release.sh @@ -13,8 +13,7 @@ fi TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)} -git checkout release -git merge -X theirs --no-commit master +git pull -X theirs --no-commit master make clean all git add svd mx_mcu_db prog_db chip_db @@ -69,5 +68,5 @@ git tag -a "v-productdb-$PRODUCTDB_VERSION" -m "Auto-release for STM32 Product D if [ ! -z ${GITLAB_ACCESS_TOKEN+x} ]; then git remote add -f ci-origin https://oauth2:${GITLAB_ACCESS_TOKEN}@gitlab.com/${CI_PROJECT_PATH} - git push --tags --force ci-origin master:release + git push --tags --force ci-origin fi |