mirror of
https://github.com/syncthing/syncthing-android.git
synced 2025-01-09 19:53:33 +00:00
Also consider Syncthing rc releases if we are building beta or rc
This commit is contained in:
parent
bdb3593468
commit
3409578995
2 changed files with 9 additions and 4 deletions
|
@ -19,9 +19,14 @@ PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
cd "syncthing/src/github.com/syncthing/syncthing/"
|
cd "syncthing/src/github.com/syncthing/syncthing/"
|
||||||
git fetch
|
git fetch
|
||||||
CURRENT_TAG=$(git describe)
|
CURRENT_TAG=$(git describe)
|
||||||
LATEST_TAG=$(git tag --sort=taggerdate | awk '!/rc/' | tail -1)
|
# Also consider Syncthing rc releases if we are building beta or rc.
|
||||||
if [ ${CURRENT_TAG} != ${LATEST_TAG} ]
|
if [[ "$NEW_VERSION_NAME" == *beta* ]] || [[ "$NEW_VERSION_NAME" == *rc* ]]; then
|
||||||
then
|
LATEST_TAG=$(git tag --sort=taggerdate | tail -1)
|
||||||
|
else
|
||||||
|
LATEST_TAG=$(git tag --sort=taggerdate | awk '!/rc/' | tail -1)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ${CURRENT_TAG} != ${LATEST_TAG} ]; then
|
||||||
git checkout -f ${LATEST_TAG}
|
git checkout -f ${LATEST_TAG}
|
||||||
cd ${PROJECT_DIR}
|
cd ${PROJECT_DIR}
|
||||||
git add "syncthing/src/github.com/syncthing/syncthing/"
|
git add "syncthing/src/github.com/syncthing/syncthing/"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5aade9a4a5506e5b71b2a9ab863790dca488700e
|
Subproject commit dc42db444b17145b7de9a0d1c56a42b9d64f3dea
|
Loading…
Reference in a new issue