merge master and fix build
This commit is contained in:
commit
481f85cd02
4 changed files with 278 additions and 287 deletions
17
.travis.yml
17
.travis.yml
|
@ -9,19 +9,19 @@ matrix:
|
|||
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
|
||||
- os: linux
|
||||
services: docker
|
||||
language: generic
|
||||
before_cache:
|
||||
- rm -rf $HOME/.cache/electron-builder/wine
|
||||
cache:
|
||||
directories:
|
||||
- node_modules
|
||||
- $HOME/.cache/electron
|
||||
- $HOME/.cache/electron-builder
|
||||
language: node_js
|
||||
node_js: "9"
|
||||
cache: false
|
||||
before_install:
|
||||
- |
|
||||
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
||||
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"
|
||||
else
|
||||
sudo apt-get -qq update
|
||||
sudo apt-get install -y libsecret-1-dev
|
||||
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.6.0
|
||||
export PATH="$HOME/.yarn/bin:$PATH"
|
||||
fi
|
||||
before_script:
|
||||
- git lfs pull
|
||||
|
@ -38,7 +38,6 @@ script:
|
|||
else
|
||||
yarn build --publish onTag
|
||||
fi
|
||||
- yarn danger ci
|
||||
branches:
|
||||
except:
|
||||
- "/^v\\d+\\.\\d+\\.\\d+$/"
|
||||
|
|
|
@ -14,7 +14,7 @@ The LBRY app is a graphical browser for the decentralized content marketplace pr
|
|||
|
||||
## Installing
|
||||
|
||||
We provide installers for Windows, macOS, and Debian-based Linux.
|
||||
We provide installers for Windows, macOS (v10.9 or greater), and Debian-based Linux.
|
||||
|
||||
| | Windows | macOS | Linux |
|
||||
| --------------------- | -------------------------------------------- | -------------------------------------------- | -------------------------------------------- |
|
||||
|
|
|
@ -96,7 +96,7 @@
|
|||
"del": "^3.0.0",
|
||||
"devtron": "^1.4.0",
|
||||
"electron": "^1.8.4",
|
||||
"electron-builder": "^20.8.1",
|
||||
"electron-builder": "^20.13.3",
|
||||
"electron-devtools-installer": "^2.2.3",
|
||||
"electron-webpack": "^1.13.0",
|
||||
"eslint": "^4.19.0",
|
||||
|
|
Loading…
Reference in a new issue