Revert CircleCI and some webpack changes to match upstream

glitch-soc · Nov 20, 2019 · 6b99941 · 6b99941
1 parent d52e27f
commit 6b99941
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,6 @@ aliases:
           DB_HOST: localhost
           DB_USER: root
           RAILS_ENV: test
-          NODE_ENV: test
           PARALLEL_TEST_PROCESSORS: 4
           ALLOW_NOPAM: true
           CONTINUOUS_INTEGRATION: true
@@ -122,10 +121,7 @@ jobs:
     steps:
       - *attach_workspace
       - *install_system_dependencies
-      - run:
-          name: Precompile assets
-          command: ./bin/rails assets:precompile
-          no_output_timeout: 40m
+      - run: ./bin/rails assets:precompile
       - persist_to_workspace:
           root: ~/projects/
           paths:

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