Skip to content

Commit 2a4371e

Browse files
committed
electron upgrade test branch
1 parent bc5bcd7 commit 2a4371e

File tree

8 files changed

+2821
-6293
lines changed

8 files changed

+2821
-6293
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ build/pyscripts.js
1010
stopserver
1111
.env*
1212
pyatv
13+
old_dist

app/package-lock.json

Lines changed: 1459 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "atv-mac-remote",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"description": "ATV Remote",
55
"productName": "ATV Remote",
66
"scripts": {

app/pnpm-workspace.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
onlyBuiltDependencies:
2+
- electron

package-lock.json

Lines changed: 1314 additions & 3081 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "atv-mac-remote",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"main": "app/main.js",
55
"description": "ATV Remote",
66
"productName": "ATV Remote",
@@ -25,16 +25,16 @@
2525
"build-arm": "npx electron-builder -m --arm64"
2626
},
2727
"devDependencies": {
28-
"electron": "^37.2.1",
29-
"electron-builder": "^26.0.12"
28+
"electron": "^38.2.1",
29+
"electron-builder": "^26.0.20"
3030
},
3131
"dependencies": {
3232
"@electron/remote": "^2.1.2",
33-
"menubar": "^9.3.0"
33+
"menubar": "^9.5.1"
3434
},
3535
"pnpm": {
3636
"onlyBuiltDependencies": [
3737
"electron"
3838
]
3939
}
40-
}
40+
}

pnpm-lock.yaml

Lines changed: 0 additions & 3152 deletions
This file was deleted.

travis.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
matrix:
2+
include:
3+
- os: osx
4+
osx_image: xcode10.2
5+
language: node_js
6+
node_js: "10"
7+
env:
8+
- ELECTRON_CACHE=$HOME/.cache/electron
9+
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
10+
11+
- os: linux
12+
services: docker
13+
language: generic
14+
15+
cache:
16+
directories:
17+
- node_modules
18+
- $HOME/.cache/electron
19+
- $HOME/.cache/electron-builder
20+
21+
script:
22+
- |
23+
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
24+
docker run --rm \
25+
--env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
26+
-v ${PWD}:/project \
27+
-v ~/.cache/electron:/root/.cache/electron \
28+
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
29+
electronuserland/builder:wine \
30+
/bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn release --linux --win"
31+
else
32+
yarn release
33+
fi
34+
before_cache:
35+
- rm -rf $HOME/.cache/electron-builder/wine
36+
37+
branches:
38+
except:
39+
- "/^v\\d+\\.\\d+\\.\\d+$/"

0 commit comments

Comments
 (0)