Differences

This shows you the differences between two versions of the page.

--- mastodon_upgrade [2023/10/07 17:59] – [Deploy the new version] handle
+++ mastodon_upgrade [2024/10/26 15:01] (current) – handle
@@ Line 8: / Line 8: @@
 ====== Build a new version ======
+**As of October 2024, these instructions seem to lead to a festival of annoying merge conflicts. See below for alternative.**
   export NEW_VERSION=4.2.0  # change to actual new version
@@ Line 17: / Line 19: @@
   git merge merged-$NEW_VERSION
   git push
+Instead (not yet tested 🤡):
+  export NEW_VERSION=4.2.0  # change to actual new version
+  git fetch upstream --tags
+  git checkout sunbeam-changes-new
+  git pull
+  git rebase v$NEW_VERSION
+  git push -f
+  git checkout trunk
+  git reset --hard v$NEW_VERSION
+  git merge sunbeam-changes-new
+  git push -f
 Then check [[https://gitlab.com/sunbeam.city/mastodon/-/jobs|the "Jobs" page on Gitlab]], and you should see the Docker image build happily running 🏃 It takes about 8 minutes.