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 [2025/11/07 23:16] (current) – handle
@@ Line 8: / Line 8: @@
 ====== Build a new version ======
+**New_instructions_final_FINAL_Nov2025.docx**
+//Theme still broken 😭//
+  export NEW_VERSION=4.5  # change to actual new version, beware wacky branch naming scheme??
+  git fetch upstream --tags
+  git checkout sunbeam-changes
+  git rebase stable-$NEW_VERSION
+  # fix some probably annoying merge conflicts
+  git push -f
+<del>**As of October 2024, these instructions seem to lead to a festival of annoying merge conflicts. See below for alternative.**</del>
   export NEW_VERSION=4.2.0  # change to actual new version
@@ Line 17: / Line 30: @@
   git merge merged-$NEW_VERSION
   git push
+<del>Instead (not yet tested 🤡):</del>
+  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.
@@ Line 28: / Line 54: @@
   cd /var/services/mastodon
   sudo -u services git pull
-  sudo docker-compose pull && \
+  sudo -s
-    sudo docker-compose down && \
+  export COMPOSE_FILE="compose.yml:compose.sunbeam.yml"
-    sudo docker-compose up -d
+  docker-compose pull && \
-  sudo docker-compose run --rm -e SKIP_POST_DEPLOYMENT_MIGRATIONS=true web bundle exec rails db:migrate
+    docker-compose down && \
+    docker-compose up -d
+  docker-compose run --rm -e SKIP_POST_DEPLOYMENT_MIGRATIONS=true web bundle exec rails db:migrate