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.

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

Delete lines 6-8 on package.json related to Bower #5060

Merged
merged 1 commit into from
Mar 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ 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 && yarn postinstall
- 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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ RUN bundle install --jobs=4
ADD . /app
WORKDIR /app

RUN yarn install && yarn postinstall && yarn upgrade
RUN yarn install && yarn upgrade
RUN passenger-config compile-nginx-engine --connect-timeout 60 --idle-timeout 60
2 changes: 1 addition & 1 deletion install_cloudnine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem install rails -v 5.2.0
sudo apt-get update
sudo apt-get -y install imagemagick ruby-rmagick
npm install -g yarn
yarn install && yarn postinstall
yarn install
gem install bundler
bundle install --without production mysql
cp db/schema.rb.example db/schema.rb
Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"version": "2.1",
"description": "PublicLab.org",
"main": "app/assets/javascripts/application.js",
"scripts": {
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'public/lib', 'junction') } catch (e) { }\""
},
"repository": {
"type": "git",
"url": "git+https://github.com/publiclab/plots2.git"
Expand Down