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 [2026/02/14 19:09] (current) – handle
@@ Line 9: / Line 9: @@
 ====== Build a new version ======
-  export NEW_VERSION=4.2.0  # change to actual new version
+  export NEW_VERSION=4.5.6
-  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 -f
-  git push
 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.
@@ Line 28: / 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