Skip to content

Commit

Permalink
Merge pull request #219 from edx/efischer/use_ci
Browse files Browse the repository at this point in the history
fix(ci): use npm ci on travis
  • Loading branch information
Eric Fischer authored May 22, 2018
2 parents 79c2751 + 3dcbb3b commit edc0d6e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
language: node_js
node_js:
- 8.11
install:
- npm i -g [email protected]
- npm ci
branches:
only:
- master
- "/v\\d+\\.\\d+\\.d+$/"
cache:
directories:
- node_modules
- "$HOME/.npm"
stages:
- PR checks ✅
- name: "Ship It \U0001F6A2"
Expand Down
1 change: 0 additions & 1 deletion .travis/validate_changes_for_merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

EXIT_STATUS=0
npm run lint || EXIT_STATUS=$?
make package-lock.validate || EXIT_STATUS=$?
make i18n.pre_validate || EXIT_STATUS=$?
commitlint-travis || EXIT_STATUS=$?
exit $EXIT_STATUS
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM node:8.11
USER root
RUN apt-get update
RUN apt-get install -y vim
RUN npm i -g [email protected]

WORKDIR /prebuilt
COPY package.json .
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,5 @@ pull_translations: ## must be exactly this name for edx tooling support, see eco
# explicit list of languages defined here and in currentlySupportedLangs.jsx
tx pull -f --mode reviewed --language="ar,fr,es_419,zh_CN"

package-lock.validate:
git diff --name-only --exit-code package-lock.json

copy-dist:
for f in dist/*; do docker cp $$f edx.devstack.studio:/edx/app/edxapp/edx-platform/node_modules/@edx/studio-frontend/dist/; done

0 comments on commit edc0d6e

Please sign in to comment.