Commit 720650d2 authored by Mike Greiling's avatar Mike Greiling

precompile webpack assets when testing

parent 24b48a37
...@@ -24,6 +24,9 @@ before_script: ...@@ -24,6 +24,9 @@ before_script:
- '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) $FLAGS' - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) $FLAGS'
- retry gem install knapsack - retry gem install knapsack
- '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate add_limits_mysql' - '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate add_limits_mysql'
- curl --silent --location https://deb.nodesource.com/setup_6.x | bash -
- apt-get install --assume-yes nodejs
- npm install
stages: stages:
- prepare - prepare
...@@ -61,6 +64,7 @@ stages: ...@@ -61,6 +64,7 @@ stages:
<<: *dedicated-runner <<: *dedicated-runner
<<: *use-db <<: *use-db
script: script:
- bundle exec rake webpack:compile
- JOB_NAME=( $CI_BUILD_NAME ) - JOB_NAME=( $CI_BUILD_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]} - export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]} - export CI_NODE_TOTAL=${JOB_NAME[2]}
...@@ -79,6 +83,7 @@ stages: ...@@ -79,6 +83,7 @@ stages:
<<: *dedicated-runner <<: *dedicated-runner
<<: *use-db <<: *use-db
script: script:
- bundle exec rake webpack:compile
- JOB_NAME=( $CI_BUILD_NAME ) - JOB_NAME=( $CI_BUILD_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]} - export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]} - export CI_NODE_TOTAL=${JOB_NAME[2]}
......
...@@ -84,6 +84,7 @@ module Gitlab ...@@ -84,6 +84,7 @@ module Gitlab
config.webpack.config_file = "config/webpack.config.js" config.webpack.config_file = "config/webpack.config.js"
config.webpack.output_dir = "public/assets/webpack" config.webpack.output_dir = "public/assets/webpack"
config.webpack.public_path = "assets/webpack" config.webpack.public_path = "assets/webpack"
config.webpack.dev_server.enabled = false
# Enable the asset pipeline # Enable the asset pipeline
config.assets.enabled = true config.assets.enabled = true
......
...@@ -22,6 +22,9 @@ Rails.application.configure do ...@@ -22,6 +22,9 @@ Rails.application.configure do
# Only use best-standards-support built into browsers # Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin config.action_dispatch.best_standards_support = :builtin
# Enable webpack dev server
config.webpack.dev_server.enabled = true
# Do not compress assets # Do not compress assets
config.assets.compress = false config.assets.compress = false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment