mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 06:06:22 +01:00
Code Issues Projects Releases Wiki Activity

Revert CircleCI and some webpack changes to match upstream

Browse Source
This commit is contained in:
Thibaut Girka 2019-11-20 18:05:24 +01:00
parent d52e27f3db
commit 6b999411fc
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -9,7 +9,6 @@ aliases:
DB_HOST: localhost DB_HOST: localhost
DB_USER: root DB_USER: root
RAILS_ENV: test RAILS_ENV: test
NODE_ENV: test
PARALLEL_TEST_PROCESSORS: 4 PARALLEL_TEST_PROCESSORS: 4
ALLOW_NOPAM: true ALLOW_NOPAM: true
CONTINUOUS_INTEGRATION: true CONTINUOUS_INTEGRATION: true
@ -122,10 +121,7 @@ jobs:
steps: steps:
- *attach_workspace - *attach_workspace
- *install_system_dependencies - *install_system_dependencies
- run: - run: ./bin/rails assets:precompile
name: Precompile assets
command: ./bin/rails assets:precompile
no_output_timeout: 40m
- persist_to_workspace: - persist_to_workspace:
root: ~/projects/ root: ~/projects/
paths: paths:

3
config/webpack/tests.js
View File

@ -5,7 +5,4 @@ const sharedConfig = require('./shared.js');
module.exports = merge(sharedConfig, { module.exports = merge(sharedConfig, {
mode: 'development', mode: 'development',
optimization: {
minimize: false,
},
}); });