data.coop/pinafore
8
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

chore: fix bundler caching in circleci (#1899)

Browse source
This commit is contained in:
Nolan Lawson 2020-11-23 18:07:38 -08:00 committed by GitHub
parent a124ba9dc8
commit d3ce112f60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.circleci/config.yml
View file

@ -30,7 +30,7 @@ jobs:
command: node -v command: node -v
- restore_cache: - restore_cache:
name: Restore yarn cache name: Restore yarn cache
key: dependency-cache-{{ checksum "yarn.lock" }} key: yarn-v1-{{ checksum "yarn.lock" }}
- run: - run:
name: Yarn install name: Yarn install
command: yarn install --immutable command: yarn install --immutable
@ -39,7 +39,7 @@ jobs:
command: yarn clone-mastodon command: yarn clone-mastodon
- restore_cache: - restore_cache:
name: Restore bundler cache name: Restore bundler cache
key: bundler-{{ checksum "mastodon/Gemfile.lock" }} key: bundler-v2-{{ checksum "mastodon/Gemfile.lock" }}
- run: - run:
name: Lint name: Lint
command: yarn lint command: yarn lint
@ -73,11 +73,11 @@ jobs:
yarn test yarn test
- save_cache: - save_cache:
name: Save yarn cache name: Save yarn cache
key: dependency-cache-{{ checksum "yarn.lock" }} key: yarn-v1-{{ checksum "yarn.lock" }}
paths: paths:
- ~/.cache/yarn - ~/.cache/yarn
- save_cache: - save_cache:
name: Save bundler cache name: Save bundler cache
key: bundler-{{ checksum "mastodon/Gemfile.lock" }} key: bundler-v2-{{ checksum "mastodon/Gemfile.lock" }}
paths: paths:
- mastodon/vendor/bundle - mastodon/vendor/bundle

2
bin/run-mastodon.js
View file

@ -59,7 +59,7 @@ async function runMastodon () {
const cwd = mastodonDir const cwd = mastodonDir
const cmds = [ const cmds = [
'gem install bundler foreman', 'gem install bundler foreman',
'bundle install --frozen', 'bundle install --frozen --path vendor/bundle',
'bundle exec rails db:migrate', 'bundle exec rails db:migrate',
'yarn --pure-lockfile' 'yarn --pure-lockfile'
] ]