luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Lock down yarn version

This commit is contained in:
Michael Lange 2017-12-13 17:04:15 -08:00
parent 72154a8d08
commit 4e74096834
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -28,13 +28,11 @@ matrix:
- os: osx - os: osx
fast_finish: true fast_finish: true
cache:
directories:
- ui/node_modules
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-mac-priv.sh ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-mac-priv.sh ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-linux.sh ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-linux.sh ; fi
- if [[ "$RUN_UI_TESTS" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1 ; fi
- if [[ "$RUN_UI_TESTS" ]]; then export PATH="$HOME/.yarn/bin:$PATH" ; fi
install: install:
- if [[ -z "$SKIP_NOMAD_TESTS" ]]; then make deps ; fi - if [[ -z "$SKIP_NOMAD_TESTS" ]]; then make deps ; fi

2
GNUmakefile
View File

@ -283,8 +283,8 @@ static-assets: ## Compile the static routes to serve alongside the API
.PHONY: test-ui .PHONY: test-ui
test-ui: ## Run Nomad UI test suite test-ui: ## Run Nomad UI test suite
@echo "--> Installing JavaScript assets" @echo "--> Installing JavaScript assets"
@cd ui && npm rebuild node-sass
@cd ui && yarn install @cd ui && yarn install
@cd ui && npm install phantomjs-prebuilt
@echo "--> Running ember tests" @echo "--> Running ember tests"
@cd ui && phantomjs --version @cd ui && phantomjs --version
@cd ui && npm test @cd ui && npm test