From 56c488ea6c54160239b55b9549d112e030b2bfee Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 2 Mar 2021 18:03:08 +0100 Subject: [PATCH] Update libsyncthing to v1.14.0 --- libsyncthing/CMakeLists.txt | 2 +- libsyncthing/go/src/github.com/syncthing/syncthing | 2 +- libsyncthing/update.sh | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libsyncthing/CMakeLists.txt b/libsyncthing/CMakeLists.txt index cdb1ae8..05530a4 100644 --- a/libsyncthing/CMakeLists.txt +++ b/libsyncthing/CMakeLists.txt @@ -6,7 +6,7 @@ set(META_PROJECT_TYPE library) set(META_APP_NAME "Syncthing library") set(META_APP_DESCRIPTION "Syncthing itself, built as a shared or static library") set(META_PROJECT_VARNAME_UPPER LIB_SYNCTHING) -set(META_SYNCTHING_VERSION "v1.13.1") +set(META_SYNCTHING_VERSION "v1.14.0") # add project files set(HEADER_FILES interface.h) diff --git a/libsyncthing/go/src/github.com/syncthing/syncthing b/libsyncthing/go/src/github.com/syncthing/syncthing index 563ed35..5e0dcd3 160000 --- a/libsyncthing/go/src/github.com/syncthing/syncthing +++ b/libsyncthing/go/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit 563ed358f409e825efe488a6d5da0f85b8f8abdc +Subproject commit 5e0dcd33fd1bdf11fbf6866f74b9d124152347bb diff --git a/libsyncthing/update.sh b/libsyncthing/update.sh index 134c810..9494f29 100755 --- a/libsyncthing/update.sh +++ b/libsyncthing/update.sh @@ -40,5 +40,6 @@ git -C "$syncthingrepodir" rebase "$latest_tag" git -C "$syncthingrepodir" branch "libsyncthing-$latest_tag" echo '==> Pushing updated/new libsyncthing branches to GitHub' -git -C "$syncthingrepodir" push -fu martchus libsyncthing-latest:libsyncthing-latest -git -C "$syncthingrepodir" push -u martchus "libsyncthing-$latest_tag:libsyncthing-$latest_tag" +git -C "$syncthingrepodir" config remote.all.url > /dev/null && remote=all || remote=martchus +git -C "$syncthingrepodir" push -fu "$remote" libsyncthing-latest:libsyncthing-latest +git -C "$syncthingrepodir" push -u "$remote" "libsyncthing-$latest_tag:libsyncthing-$latest_tag"