Mastodon
/
Pinafore-Web-Client-Frontend
mirror of https://github.com/nolanlawson/pinafore
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: update to mastodon v3.5.1 (#2133) 

* chore: update to mastodon v3.5.1

* chore: empty commit
This commit is contained in:
Nolan Lawson 2022-04-30 14:38:37 -07:00 committed by GitHub
parent 8685e4f603
commit 6794514916
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -17,11 +17,11 @@ executors:
node: node:
working_directory: ~/pinafore working_directory: ~/pinafore
docker: docker:
- image: cimg/ruby:2.7.2-browsers - image: cimg/ruby:3.0.3-browsers
node_and_ruby: node_and_ruby:
working_directory: ~/pinafore working_directory: ~/pinafore
docker: docker:
- image: cimg/ruby:2.7.2-browsers - image: cimg/ruby:3.0.3-browsers
- image: circleci/postgres:12.2 - image: circleci/postgres:12.2
environment: environment:
POSTGRES_USER: pinafore POSTGRES_USER: pinafore

4
CONTRIBUTING.md
View File

@ -120,8 +120,8 @@ or
1. Run `rm -fr mastodon` to clear out all Mastodon data 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. 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 2. Update the `GIT_TAG_OR_BRANCH` in `clone-mastodon.js` to whatever you want
3. If the Ruby version changed, install it and update `setup-mastodon-in.travis.sh` 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` 4. Run `yarn run-mastodon`
5. Run `yarn backup-mastodon-data` to overwrite the data in `fixtures/` 5. Run `yarn backup-mastodon-data` to overwrite the data in `fixtures/`
6. Uncomment `await restoreMastodonData()` in `run-mastodon.js` 6. Uncomment `await restoreMastodonData()` in `run-mastodon.js`

2
bin/clone-mastodon.js
View File

@ -12,7 +12,7 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname)
const dir = __dirname const dir = __dirname
const GIT_URL = 'https://github.com/tootsuite/mastodon.git' 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') const mastodonDir = path.join(dir, '../mastodon')

2
bin/mastodon-config.js
View File

@ -17,7 +17,7 @@ DB_NAME=${DB_NAME}
DB_PASS=${DB_PASS} 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) const __dirname = path.dirname(new URL(import.meta.url).pathname)
export const mastodonDir = path.join(__dirname, '../mastodon') export const mastodonDir = path.join(__dirname, '../mastodon')