From 6794514916e358b1ea3179f1f9fda3b42aea47f7 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sat, 30 Apr 2022 14:38:37 -0700
Subject: [PATCH] chore: update to mastodon v3.5.1 (#2133)

* chore: update to mastodon v3.5.1

* chore: empty commit
---
 .circleci/config.yml   | 4 ++--
 CONTRIBUTING.md        | 4 ++--
 bin/clone-mastodon.js  | 2 +-
 bin/mastodon-config.js | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 658aca8c..cab97710 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,11 +17,11 @@ executors:
   node:
     working_directory: ~/pinafore
     docker:
-      - image: cimg/ruby:2.7.2-browsers
+      - image: cimg/ruby:3.0.3-browsers
   node_and_ruby:
     working_directory: ~/pinafore
     docker:
-      - image: cimg/ruby:2.7.2-browsers
+      - image: cimg/ruby:3.0.3-browsers
       - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: pinafore
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4ae5f039..ced15084 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -120,8 +120,8 @@ or
 
 1. Run `rm -fr mastodon` to clear out all Mastodon data
 1. Comment out `await restoreMastodonData()` in `run-mastodon.js` to avoid actually populating the database with statuses/favorites/etc.
-2. Update the `GIT_TAG_OR_BRANCH` in `run-mastodon.js` to whatever you want
-3. If the Ruby version changed, install it and update `setup-mastodon-in.travis.sh`
+2. Update the `GIT_TAG_OR_BRANCH` in `clone-mastodon.js` to whatever you want
+3. If the Ruby version changed (check Mastodon's `.ruby-version`), install it and update `RUBY_VERSION` in `mastodon-config.js` as well as the Ruby version in `.circleci/config.yml`.
 4. Run `yarn run-mastodon`
 5. Run `yarn backup-mastodon-data` to overwrite the data in `fixtures/`
 6. Uncomment `await restoreMastodonData()` in `run-mastodon.js`
diff --git a/bin/clone-mastodon.js b/bin/clone-mastodon.js
index 0de52087..0dc2d8a6 100644
--- a/bin/clone-mastodon.js
+++ b/bin/clone-mastodon.js
@@ -12,7 +12,7 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const dir = __dirname
 
 const GIT_URL = 'https://github.com/tootsuite/mastodon.git'
-const GIT_TAG = 'v3.4.1'
+const GIT_TAG = 'v3.5.1'
 
 const mastodonDir = path.join(dir, '../mastodon')
 
diff --git a/bin/mastodon-config.js b/bin/mastodon-config.js
index bbbf7718..7b24282f 100644
--- a/bin/mastodon-config.js
+++ b/bin/mastodon-config.js
@@ -17,7 +17,7 @@ DB_NAME=${DB_NAME}
 DB_PASS=${DB_PASS}
 `
 
-export const RUBY_VERSION = '2.7.2'
+export const RUBY_VERSION = '3.0.3'
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname)
 export const mastodonDir = path.join(__dirname, '../mastodon')