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:51:03 +01:00
parent 68497cc5f1
commit 620fc833e3
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/do_release.sh
View file

@ -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