From 50d491b432ce811c4d5e597e952eb18a89ae6c19 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 22 Feb 2025 14:25:31 +0200 Subject: [PATCH] build(release): update master branch automatically --- bin/release.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/release.sh b/bin/release.sh index 042c3a5da..6d7093bc2 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -export GITHUB_REPO=trilium - if [[ $# -eq 0 ]] ; then echo "Missing argument of new version" exit 1 @@ -47,3 +45,11 @@ echo "Tagging commit with $TAG" git tag $TAG git push origin $TAG + +echo "Updating master" + +git fetch +git checkout master +git reset --hard origin/master +git merge origin/develop +git push \ No newline at end of file