Skip to content

Commit

Permalink
Use npm instead of yarn for CI/CD
Browse files Browse the repository at this point in the history
  • Loading branch information
chrsmith committed Nov 7, 2019
1 parent bb21069 commit dc3a3c1
Show file tree
Hide file tree
Showing 3 changed files with 499 additions and 498 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ install:
- export PATH="$HOME/.pulumi/bin:$PATH"
# Yarn and TS toolchain.
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2
- yarn global add tslint
- yarn global add typescript
- npm install --global tslint
- npm install --global typescript
- npm install --global mocha
- make ensure
script:
- make travis_${TRAVIS_EVENT_TYPE}
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ STEP_MESSAGE = @echo -e "\033[0;32m$(shell echo '$(PROJECT_NAME): $@' | tr a-z A
.PHONY: ensure
ensure::
$(call STEP_MESSAGE)
yarn install
npm install

# Golang dependencies for the integration tests.
go get -t -d ./integration-tests

.PHONY: lint
lint::
$(call STEP_MESSAGE)
yarn lint
npm run lint

.PHONY: build
build::
$(call STEP_MESSAGE)
yarn build
npm build

.PHONY: test
test::
Expand Down
Loading

0 comments on commit dc3a3c1

Please sign in to comment.