From 4a118787548afe168f128e468a1fd341809b3821 Mon Sep 17 00:00:00 2001 From: Nico <github@nicoboehr.de> Date: Sun, 15 Jun 2025 15:04:11 +0000 Subject: [PATCH] bump gluon to v2023.2.5 --- gluon | 2 +- scripts/update-gluon.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gluon b/gluon index 5e46753ad..4863680b3 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit 5e46753ad7564b3c2acea30de1b69e4a801a92c4 +Subproject commit 4863680b371fa8a5ce6e9bfc6fba23dbb4d93c0b diff --git a/scripts/update-gluon.sh b/scripts/update-gluon.sh index 925bc0e87..306e9c2a4 100755 --- a/scripts/update-gluon.sh +++ b/scripts/update-gluon.sh @@ -27,12 +27,18 @@ verify_remotes() { verify_remotes git -C "$gluon_path" fetch origin --tags +git -C "$gluon_path" fetch upstream --tags git -C "$gluon_path" fetch upstream "$tag_to_update_to" current_tag_name=$(git -C "$gluon_path" describe) current_upstream_tag_name=${current_tag_name/-ffs*/} +echo Detected current tag: $current_tag_name +echo Detected upstream tag: $current_upstream_tag_name +echo Looks OK? +read + git -C "$gluon_path" checkout -b "$tag_to_update_to-ffs" git -C "$gluon_path" rebase -i "$current_upstream_tag_name" --onto FETCH_HEAD -- GitLab