Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use js libs from container in testing #3306

Merged
merged 6 commits into from
Mar 31, 2019
Merged

Use js libs from container in testing #3306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc5a64f
Use js libs from container in testing
icarito Aug 25, 2018
1a50002
Merge branch 'master' into dont_mount_current_dir_to_container
icarito Oct 12, 2018
db2c766
Merge branch 'master' into dont_mount_current_dir_to_container
icarito Mar 28, 2019
1e16326
Update .gitlab-ci.yml
icarito Mar 28, 2019
fb37ba6
Update .travis.yml
icarito Mar 28, 2019
4f6ccf0
Don't precompile for gitlab tests
icarito Mar 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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: