diff --git a/.travis.yml b/.travis.yml index 1984bb4..ed6aaa9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,12 @@ os: - osx install: - - npm install + - yarn install script: - - npm run build - - npm run test - - if [[ "$TRAVIS_TAG" != "" ]]; then npm run prepare-release; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_TAG" != "" ]]; then npm run package -- linux; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then npm run package -- mac; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then npm run package -- win; fi + - yarn run build + - yarn test + - if [[ "$TRAVIS_TAG" != "" ]]; then yarn run prepare-release; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- linux; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- mac; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- win; fi diff --git a/package.json b/package.json index 06fbca3..48f5c8c 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,10 @@ "main": "dist/src/electron.js", "scripts": { "start": "electron .", - "test": "npm run test-backend", - "build": "tsc && cd app && npm run build && cd ..", - "test-backend": "cd backend && npm run test && cd ..", + "test": "yarn run test-backend", + "install": "cd app; yarn install; cd ..", + "build": "tsc && cd app && yarn run build && cd ..", + "test-backend": "cd backend && yarn run test && cd ..", "prepare-release": "./prepare-release.sh", "package": "ts-node package.ts", "package-with-docker": "./package-with-docker.sh"