Skip to content

Commit

Permalink
Use js libs from container in testing (publiclab#3306)
Browse files Browse the repository at this point in the history
* Use js libs from container in testing

* Update .gitlab-ci.yml

* Update .travis.yml

* Don't precompile for gitlab tests
  • Loading branch information
icarito authored and jywarren committed Mar 31, 2019
1 parent dbb9256 commit f7e5f35
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 0 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ before_script:
- docker-compose up -d
- docker-compose exec -T web rake db:setup
- docker-compose exec -T web rake db:migrate
- docker-compose exec -T web yarn --ignore-engines --ignore-scripts --modules-folder ./public/lib

job:
script:
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ install:
- netstat -ltpn
- docker-compose exec web bash -c "rake db:setup"
- docker-compose exec web bash -c "rake db:migrate"
- docker-compose exec web yarn --ignore-engines --ignore-scripts --modules-folder ./public/lib
- docker-compose exec web bash -c "rake assets:precompile"
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then gem install danger danger-junit; fi'

Expand Down
3 changes: 3 additions & 0 deletions containers/docker-compose-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ services:
- redis
volumes:
- ..:/app
- js_libs:/app/public/lib
restart: unless-stopped
sidekiq:
build: ..
Expand All @@ -46,3 +47,5 @@ services:
- .:/app
environment:
- REDIS_URL=redis://redis:6379/0
volumes:
js_libs:

0 comments on commit f7e5f35

Please sign in to comment.