Skip to content
This repository was archived by the owner on May 21, 2025. It is now read-only.

Commit b348e63

Browse files
committed
Merge branch 'develop'
2 parents ed51517 + a22f83b commit b348e63

File tree

5 files changed

+9
-9309
lines changed

5 files changed

+9
-9309
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
# logs
2222
npm-debug.log*
23-
yarn-debug.log*
24-
yarn-error.log*
2523

2624
# deb building
2725
ppa/app/debian/debhelper-build-stamp

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ matrix:
2424
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
2525

2626
cache:
27-
yarn: true
2827
directories:
2928
- node_modules
3029
- $HOME/.cache/electron
@@ -39,17 +38,17 @@ before_install:
3938
fi
4039
4140
install:
42-
- yarn install
41+
- npm i
4342

4443
before_script:
4544
- git lfs pull
4645

4746
script:
4847
- |
4948
if [ "$TRAVIS_BRANCH" == "develop" ]; then
50-
yarn test && yarn dist
49+
npm test && npm run dist
5150
elif [ "$TRAVIS_BRANCH" == "master" ]; then
52-
yarn test && yarn release
51+
npm test && npm run release
5352
fi
5453
5554
before_cache:

appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ cache:
1717
install:
1818
- ps: Install-Product node LTS x64
1919
- npm i --global --production windows-build-tools
20-
- yarn
2120

2221
platform:
2322
- x64
2423

2524
build_script:
26-
- yarn dist
25+
- npm run dist
2726

2827
test: off
2928

@@ -35,4 +34,4 @@ for:
3534

3635
configuration: Release
3736
build_script:
38-
- yarn release
37+
- npm run release

ppa/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ To post a `.deb` on Launchpad for Ubuntu a debian source package needs to be mad
66

77
For compatibility purposes it is best to do this on Ubuntu 16.04/Xenial (the oldest system we are distributing for).
88

9-
You must have the variables `DEBFULLNAME` and `DEBEMAIL` set in your shell for `yarn ppa` to work properly. The email must have a gpg key associated with it if you plan on signing the files.
9+
You must have the variables `DEBFULLNAME` and `DEBEMAIL` set in your shell for `npm run ppa` to work properly. The email must have a gpg key associated with it if you plan on signing the files.
1010

1111
```
12-
yarn install
13-
yarn dist
14-
yarn ppa
12+
npm i
13+
npm run dist
14+
npm run ppa
1515
VER=0.8.0
1616
cd ppa
1717
debsign *.changes *.dsc

0 commit comments

Comments
 (0)