Fixed travis build script.
Upgraded from xcode 9.2 to 9.4. Use yarn instead of npm for windows and linux builds. Unpin minor version of node in package.json.
This commit is contained in:
parent
aa48a756c5
commit
dab195a996
@ -1,7 +1,7 @@
|
|||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode9.2
|
osx_image: xcode9.4
|
||||||
language: node_js
|
language: node_js
|
||||||
node_js: "10"
|
node_js: "10"
|
||||||
env:
|
env:
|
||||||
@ -27,6 +27,7 @@ before_install:
|
|||||||
mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.3.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.3.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1
|
mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.3.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.3.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1
|
||||||
export PATH="/tmp/git-lfs:$PATH"
|
export PATH="/tmp/git-lfs:$PATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- git lfs pull
|
- git lfs pull
|
||||||
|
|
||||||
@ -39,10 +40,11 @@ script:
|
|||||||
-v ~/.cache/electron:/root/.cache/electron \
|
-v ~/.cache/electron:/root/.cache/electron \
|
||||||
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
|
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
|
||||||
electronuserland/builder:wine \
|
electronuserland/builder:wine \
|
||||||
/bin/bash -c "npm install && npm run travislinux"
|
/bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn travislinux"
|
||||||
else
|
else
|
||||||
npm run travisdarwin
|
npm run travisdarwin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
before_cache:
|
before_cache:
|
||||||
- rm -rf $HOME/.cache/electron-builder/wine
|
- rm -rf $HOME/.cache/electron-builder/wine
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
"dist:all": "npm run dist -- -wl --x64"
|
"dist:all": "npm run dist -- -wl --x64"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "10.0.x"
|
"node": "10.x.x"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
Loading…
Reference in New Issue
Block a user