about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-11-20 18:05:24 +0100
committerThibaut Girka <thib@sitedethib.com>2019-11-20 18:05:24 +0100
commit6b999411fc30c1eee7c006ea7294791a7824c162 (patch)
tree4a704a2cd74531937b3048eefe35278b45d2f62c
parentd52e27f3dbf7a98844ba7091dcd49ad88083cd1a (diff)
Revert CircleCI and some webpack changes to match upstream
-rw-r--r--.circleci/config.yml6
-rw-r--r--config/webpack/tests.js3
2 files changed, 1 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 796d6cf6e..ff8eb4859 100644
--- 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
index f91244587..8b56eb92f 100644
--- 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,
-  },
 });