diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-27 18:17:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-27 18:17:44 +0100 |
commit | 9ab7f492a4ba032950d33813827c7cccdb72e086 (patch) | |
tree | f185f2cb8fd10cc715ce6027c64a8fb1d4110f2c | |
parent | fix(Linux): Add missing app icons (diff) | |
parent | remove gulp as a global dependency (diff) | |
download | ferdium-app-9ab7f492a4ba032950d33813827c7cccdb72e086.tar.gz ferdium-app-9ab7f492a4ba032950d33813827c7cccdb72e086.tar.zst ferdium-app-9ab7f492a4ba032950d33813827c7cccdb72e086.zip |
Merge pull request #353 from meetfranz/chore/build-setup
[PR] build setup
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | appveyor.yml | 2 | ||||
-rw-r--r-- | electron-builder.yml | 1 | ||||
-rw-r--r-- | package.json | 1 | ||||
-rw-r--r-- | yarn.lock | 25 |
6 files changed, 27 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index b3ebc4f25..78c1e3693 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -9,8 +9,6 @@ matrix: | |||
9 | language: node_js | 9 | language: node_js |
10 | 10 | ||
11 | before_script: | 11 | before_script: |
12 | - yarn add global gulp-cli@1.2.2 | ||
13 | - yarn add global gulpjs/gulp#4.0 | ||
14 | - yarn add global node-sass | 12 | - yarn add global node-sass |
15 | - yarn install | 13 | - yarn install |
16 | 14 | ||
@@ -19,7 +17,7 @@ script: | |||
19 | - travis_wait yarn build | 17 | - travis_wait yarn build |
20 | 18 | ||
21 | node_js: | 19 | node_js: |
22 | - '7' | 20 | - '8' |
23 | 21 | ||
24 | before_install: | 22 | before_install: |
25 | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi | 23 | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi |
@@ -31,12 +31,6 @@ $ brew install yarn | |||
31 | ##### Linux | 31 | ##### Linux |
32 | [Install Yarn on Linux](https://yarnpkg.com/lang/en/docs/install/) | 32 | [Install Yarn on Linux](https://yarnpkg.com/lang/en/docs/install/) |
33 | 33 | ||
34 | #### Install Gulp 4 | ||
35 | ```bash | ||
36 | $ yarn add global gulp-cli@1.2.2 | ||
37 | $ yarn add global gulpjs/gulp#4.0 | ||
38 | ``` | ||
39 | |||
40 | #### Fix native modules to match current electron node version | 34 | #### Fix native modules to match current electron node version |
41 | ```bash | 35 | ```bash |
42 | $ yarn run rebuild | 36 | $ yarn run rebuild |
diff --git a/appveyor.yml b/appveyor.yml index a8e55d25f..d9296b1f6 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -11,8 +11,6 @@ version: 5.0.0.{build} | |||
11 | install: | 11 | install: |
12 | - ps: Install-Product node 8 | 12 | - ps: Install-Product node 8 |
13 | - yarn cache clean | 13 | - yarn cache clean |
14 | - yarn add global gulp-cli@1.2.2 | ||
15 | - yarn add global gulpjs/gulp#4.0 | ||
16 | - yarn install | 14 | - yarn install |
17 | 15 | ||
18 | # cache: | 16 | # cache: |
diff --git a/electron-builder.yml b/electron-builder.yml index 2b2cf3fcb..03e59e462 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -29,6 +29,7 @@ linux: | |||
29 | target: | 29 | target: |
30 | - target: AppImage | 30 | - target: AppImage |
31 | - target: deb | 31 | - target: deb |
32 | - target: tar.gz | ||
32 | 33 | ||
33 | nsis: | 34 | nsis: |
34 | perMachine: false | 35 | perMachine: false |
diff --git a/package.json b/package.json index 54df530ca..8a5eee7b2 100644 --- a/package.json +++ b/package.json | |||
@@ -38,6 +38,7 @@ | |||
38 | "electron-updater": "^2.4.3", | 38 | "electron-updater": "^2.4.3", |
39 | "electron-window-state": "^4.1.0", | 39 | "electron-window-state": "^4.1.0", |
40 | "fs-extra": "^3.0.1", | 40 | "fs-extra": "^3.0.1", |
41 | "gulp-cli": "1.2.2", | ||
41 | "ini": "^1.3.4", | 42 | "ini": "^1.3.4", |
42 | "jshashes": "^1.0.6", | 43 | "jshashes": "^1.0.6", |
43 | "jsonwebtoken": "^7.4.1", | 44 | "jsonwebtoken": "^7.4.1", |
@@ -2974,6 +2974,29 @@ gulp-babel@^6.1.2: | |||
2974 | through2 "^2.0.0" | 2974 | through2 "^2.0.0" |
2975 | vinyl-sourcemaps-apply "^0.2.0" | 2975 | vinyl-sourcemaps-apply "^0.2.0" |
2976 | 2976 | ||
2977 | gulp-cli@1.2.2: | ||
2978 | version "1.2.2" | ||
2979 | resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.2.2.tgz#7392def6316c6e7939a4f296f3f540151ae3a275" | ||
2980 | dependencies: | ||
2981 | archy "^1.0.0" | ||
2982 | chalk "^1.1.0" | ||
2983 | fancy-log "^1.1.0" | ||
2984 | gulplog "^1.0.0" | ||
2985 | interpret "^1.0.0" | ||
2986 | liftoff "^2.1.0" | ||
2987 | lodash.isfunction "^3.0.8" | ||
2988 | lodash.isplainobject "^4.0.4" | ||
2989 | lodash.isstring "^4.0.1" | ||
2990 | lodash.sortby "^4.5.0" | ||
2991 | matchdep "^1.0.0" | ||
2992 | mute-stdout "^1.0.0" | ||
2993 | pretty-hrtime "^1.0.0" | ||
2994 | semver-greatest-satisfied-range "^1.0.0" | ||
2995 | tildify "^1.0.0" | ||
2996 | v8flags "^2.0.9" | ||
2997 | wreck "^6.3.0" | ||
2998 | yargs "^3.28.0" | ||
2999 | |||
2977 | gulp-cli@^1.0.0: | 3000 | gulp-cli@^1.0.0: |
2978 | version "1.4.0" | 3001 | version "1.4.0" |
2979 | resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.4.0.tgz#6f5bbe2cd0bdb4849d12cf9e1246a5861f8b4f88" | 3002 | resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.4.0.tgz#6f5bbe2cd0bdb4849d12cf9e1246a5861f8b4f88" |
@@ -3768,7 +3791,7 @@ levn@^0.3.0, levn@~0.3.0: | |||
3768 | prelude-ls "~1.1.2" | 3791 | prelude-ls "~1.1.2" |
3769 | type-check "~0.3.2" | 3792 | type-check "~0.3.2" |
3770 | 3793 | ||
3771 | liftoff@^2.3.0: | 3794 | liftoff@^2.1.0, liftoff@^2.3.0: |
3772 | version "2.3.0" | 3795 | version "2.3.0" |
3773 | resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" | 3796 | resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" |
3774 | dependencies: | 3797 | dependencies: |