User Tools

Site Tools

Trace: • financial_statements
mastodon_upgrade

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
mastodon_upgrade [2025/11/07 23:16] – handlemastodon_upgrade [2026/04/25 20:27] (current) – handle
Line 9: Line 9:
 ====== Build a new version ====== ====== Build a new version ======
  
-**New_instructions_final_FINAL_Nov2025.docx** +  export NEW_VERSION=4.5.6
- +
-//Theme still broken 😭// +
- +
-  export NEW_VERSION=4.5  # change to actual new version, beware wacky branch naming scheme??+
   git fetch upstream --tags   git fetch upstream --tags
   git checkout sunbeam-changes   git checkout sunbeam-changes
-  git rebase stable-$NEW_VERSION+  git rebase v$NEW_VERSION
   # fix some probably annoying merge conflicts   # fix some probably annoying merge conflicts
   git push -f   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> +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 20 minutes 🐌
- +
-  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 merge v$NEW_VERSION +
-  git checkout trunk +
-  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.+
  
 ====== Deploy the new version ====== ====== Deploy the new version ======
Line 55: Line 27:
   sudo -u services git pull   sudo -u services git pull
   sudo -s   sudo -s
-  export COMPOSE_FILE="compose.yml:compose.sunbeam.yml" 
   docker-compose pull && \   docker-compose pull && \
     docker-compose down && \     docker-compose down && \
     docker-compose up -d     docker-compose up -d
   docker-compose run --rm -e SKIP_POST_DEPLOYMENT_MIGRATIONS=true web bundle exec rails db:migrate   docker-compose run --rm -e SKIP_POST_DEPLOYMENT_MIGRATIONS=true web bundle exec rails db:migrate
mastodon_upgrade.1762557361.txt.gz · Last modified: by handle