Differences

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

--- mastodon_upgrade [2024/10/26 15:00] – handle
+++ mastodon_upgrade [2026/02/14 19:09] (current) – handle
@@ Line 9: / Line 9: @@
 ====== 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.5.6
-  export NEW_VERSION=4.2.0  # change to actual new version
-  git checkout trunk
   git fetch upstream --tags
-  git checkout -b merged-$NEW_VERSION
+  git checkout sunbeam-changes
-  git merge v$NEW_VERSION
+  git rebase $NEW_VERSION
-  git checkout trunk
+  # fix some probably annoying merge conflicts
-  git merge merged-$NEW_VERSION
-  git push
-Instead:
-  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
@@ Line 43: / Line 26: @@
   cd /var/services/mastodon
   sudo -u services git pull
-  sudo docker-compose pull && \
+  sudo -s
-    sudo docker-compose down && \
+  docker-compose pull && \
-    sudo docker-compose up -d
+    docker-compose down && \
-  sudo docker-compose run --rm -e SKIP_POST_DEPLOYMENT_MIGRATIONS=true web bundle exec rails db:migrate
+    docker-compose up -d
+  docker-compose run --rm -e SKIP_POST_DEPLOYMENT_MIGRATIONS=true web bundle exec rails db:migrate