Skip to content
This repository was archived by the owner on Oct 22, 2021. It is now read-only.

Commit 552e12e

Browse files
committed
🍎 Fix Mac builds
#97
1 parent ab4ccb0 commit 552e12e

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

.travis.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
1-
os: linux
2-
services:
3-
- docker
4-
language: generic
1+
os:
2+
- linux
3+
- osx
4+
language: node_js
5+
node_js:
6+
- "8"
57

6-
cache:
7-
directories:
8-
- node_modules
9-
- "$HOME/.cache/electron"
10-
- "$HOME/.cache/electron-builder"
8+
before_install:
9+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib ; fi
1110

1211
before_script:
13-
- git lfs pull
12+
- npm i -g greenkeeper-lockfile@1
13+
- npm install
14+
- greenkeeper-lockfile-update
1415

1516
script:
16-
- |
17-
docker run --rm \
18-
--env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
19-
-v ${PWD}:/project \
20-
-v ~/.cache/electron:/root/.cache/electron \
21-
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
22-
electronuserland/builder \
23-
/bin/bash -c "npm install -g greenkeeper-lockfile@1 && npm install && greenkeeper-lockfile-update && npm run build && greenkeeper-lockfile-upload"
17+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run build-darwin ; fi
18+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run build-linux ; fi
2419

25-
before_cache:
26-
- rm -rf $HOME/.cache/electron-builder/wine
20+
after_script:
21+
- greenkeeper-lockfile-upload
2722

2823
before_deploy:
2924
- sudo rm -rf dist/*/

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717
"install-linux": "npm install && cd src && npm install && ./../node_modules/.bin/electron-rebuild -f -w node-pty && cd ..",
1818
"preinstall-windows": "npm install --global --production windows-build-tools && npm install --global node-gyp && setx PYTHON \"%USERPROFILE%\\.windows-build-tools\\python27\\python.exe\"",
1919
"install-windows": "npm install && cd src && npm install && ..\\node_modules\\.bin\\electron-rebuild -f -w node-pty && cd ..",
20-
"prebuild": "mkdir prebuild-src && cp -R src/* prebuild-src/ && node prebuild-minify.js && cd prebuild-src && npm install",
20+
"prebuild-linux": "mkdir prebuild-src && cp -R src/* prebuild-src/ && node prebuild-minify.js && cd prebuild-src && npm install",
21+
"prebuild-darwin": "mkdir prebuild-src && cp -R src/* prebuild-src/ && node prebuild-minify.js && cd prebuild-src && npm install",
2122
"prebuild-windows": "mkdir prebuild-src && xcopy src\\* prebuild-src\\ /E /C /Q /Y && node prebuild-minify.js && cd prebuild-src && npm install",
22-
"build": "./node_modules/.bin/electron-builder build -lm -p never",
23+
"build-linux": "./node_modules/.bin/electron-builder build -l -p never",
24+
"build-darwin": "./node_modules/.bin/electron-builder build -m -p never",
2325
"build-windows": "node_modules\\.bin\\electron-builder -w -p never",
24-
"postbuild": "rm -R prebuild-src",
26+
"postbuild-linux": "rm -R prebuild-src",
27+
"postbuild-darwin": "rm -R prebuild-src",
2528
"postbuild-windows": "rmdir /S /Q prebuild-src"
2629
},
2730
"repository": {

0 commit comments

Comments
 (0)