Skip to content

Commit

Permalink
Merge pull request ZyqGitHub1#52 from ZyqGitHub1/dev
Browse files Browse the repository at this point in the history
use npm in ci
  • Loading branch information
ZyqGitHub1 authored Sep 18, 2019
2 parents ae9cb0f + 35e1e77 commit ea764fd
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ before_install:
script:
- |
rm -rf yarn.lock
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
docker run --rm \
--env-file <(env | grep -vE '\r|\n' | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
Expand All @@ -45,7 +46,7 @@ script:
-v ~/.cache/electron:/root/.cache/electron \
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
electronuserland/builder:wine \
/bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn electron:build --bundler builder --target linux"
/bin/bash -c "npm install && npm run electron:build --bundler builder --target linux"
linux_file=`ls dist/electron/Packaged/ | grep '.AppImage$'`
./ossutil64 cp "dist/electron/Packaged/${linux_file}" "${BUCKET}/${linux_file}" -f

Expand All @@ -57,11 +58,11 @@ script:
-v ~/.cache/electron:/root/.cache/electron \
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
electronuserland/builder:wine \
/bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn electron:build --bundler builder --target win"
/bin/bash -c "npm install && npm run electron:build --bundler builder --target win"
win_file=`ls dist/electron/Packaged/ | grep '.zip$'`
./ossutil64 cp "dist/electron/Packaged/${win_file}" "${BUCKET}/${win_file}" -f
else
yarn electron:build
npm electron:build
osx_file=`ls dist/electron/Packaged/ | grep '.dmg$'`
./ossutilmac64 cp "dist/electron/Packaged/${osx_file}" "${BUCKET}/${osx_file}" -f
fi
Expand Down

0 comments on commit ea764fd

Please sign in to comment.