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

Jump to bottom

Updating yarn packages #173

Merged
merged 2 commits into from
Jan 24, 2020
Merged

Updating yarn packages #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5368e5d
wait for the database in `ci-rspec`
Jan 23, 2020
1fa1241
Updating yarn packages
awead Jan 22, 2020
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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN gem install bundler:2.0.2
RUN bundle install --path vendor/bundle

COPY package.json yarn.lock /app/
RUN yarn
RUN yarn --frozen-lockfile

COPY --chown=app . /app

Expand Down
8 changes: 8 additions & 0 deletions bin/ci-rspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ then
exit 1
fi

# Sometimes, if we do a good enough job of caching the docker build, rspec will start running before the database is ready
echo "Waiting for Postgres to become available"
if ! timeout 60 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' "${POSTGRES_HOST:-localhost}" "${POSTGRES_PORT:-5432}"
then
echo "Postgres never became ready. Exiting"
exit 1
fi

echo "Initaizing Solr"
bundle exec rake solr:init

Expand Down
32 changes: 16 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
"name": "scholarsphere",
"private": true,
"dependencies": {
"@rails/actioncable": "^6.0.0-alpha",
"@rails/activestorage": "^6.0.0-alpha",
"@rails/ujs": "^6.0.0-alpha",
"@rails/webpacker": "^4.0.7",
"@uppy/aws-s3-multipart": "^1.3.4",
"@uppy/core": "^1.4.0",
"@uppy/dashboard": "^1.3.0",
"@uppy/xhr-upload": "^1.3.0",
"blacklight-frontend": "^7.2.0",
"caniuse-lite": "^1.0.30000999",
"popper.js": "^1.15.0",
"@rails/actioncable": "^6.0.2-1",
"@rails/activestorage": "^6.0.2-1",
"@rails/ujs": "^6.0.2-1",
"@rails/webpacker": "^4.2.2",
"@uppy/aws-s3-multipart": "^1.4.0",
"@uppy/core": "^1.7.1",
"@uppy/dashboard": "^1.5.2",
"@uppy/xhr-upload": "^1.4.2",
"blacklight-frontend": "^7.5.0",
"caniuse-lite": "^1.0.30001022",
"popper.js": "^1.16.1",
"stimulus": "^1.1.1",
"twitter-typeahead-rails": "https://github.com/yourabi/twitter-typeahead-rails.git#v0.11.1.pre.corejavascript"
},
"version": "0.1.0",
"devDependencies": {
"babel-eslint": "^10.0.3",
"eslint": "^6.6.0",
"eslint": "^6.8.0",
"eslint-config-standard": "^14.1.0",
"eslint-loader": "^3.0.2",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-node": "^10.0.0",
"eslint-loader": "^3.0.3",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"webpack-dev-server": "^3.8.2"
"webpack-dev-server": "^3.10.1"
},
"scripts": {
"lint": "yarn run eslint --ext .js app/javascript"
Expand Down
Loading