diff --git a/.travis.yml b/.travis.yml index a3782eb6d..f9223c3eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,32 +7,29 @@ matrix: env: - ELECTRON_CACHE=$HOME/.cache/electron - 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 - 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" fi - before_script: - git lfs pull - script: - | if [ "$TRAVIS_OS_NAME" == "linux" ]; then docker run --rm \ - --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \ + --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \ -v ${PWD}:/project \ -v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \ @@ -41,10 +38,6 @@ script: else yarn release fi - -before_cache: - - rm -rf $HOME/.cache/electron-builder/wine - branches: except: - "/^v\\d+\\.\\d+\\.\\d+$/" diff --git a/electron-builder.json b/electron-builder.json index 09c928130..9e0a8f86b 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -1,10 +1,5 @@ { "appId": "io.lbry.LBRY", - "publish": { - "provider": "s3", - "bucket": "releases.lbry.io", - "path": "app/latest" - }, "mac": { "category": "public.app-category.entertainment" }, diff --git a/package.json b/package.json index 4c1ba616d..d9fc0628e 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "install": "^0.10.2", "jayson": "^2.0.2", "jshashes": "^1.0.7", - "keytar-prebuild": "^4.0.4", + "keytar-prebuild": "^4.1.1", "localforage": "^1.5.0", "moment": "^2.20.1", "npm": "^5.5.1", diff --git a/yarn.lock b/yarn.lock index 819f2e7ba..50c4b0ce2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2635,7 +2635,7 @@ detect-indent@~5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" -detect-libc@^1.0.2: +detect-libc@^1.0.2, detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -5207,12 +5207,12 @@ keypress@0.1.x: version "0.1.0" resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz#4a3188d4291b66b4f65edb99f806aa9ae293592a" -keytar-prebuild@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/keytar-prebuild/-/keytar-prebuild-4.0.4.tgz#eb6354c68f2b3609dc325ef8709844632652d602" +keytar-prebuild@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/keytar-prebuild/-/keytar-prebuild-4.1.1.tgz#f31cd3b2e5de743303f8c2f607f29f0117981295" dependencies: - nan "2.7.0" - prebuild-install "^2.2.2" + nan "2.8.0" + prebuild-install "^2.5.0" killable@^1.0.0: version "1.0.0" @@ -5949,18 +5949,14 @@ mute-stream@0.0.7, mute-stream@~0.0.4: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" +nan@2.8.0, nan@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" nan@^2.3.0, nan@^2.3.2: version "2.5.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2" -nan@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" - natives@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.1.tgz#011acce1f7cbd87f7ba6b3093d6cd9392be1c574" @@ -7068,9 +7064,9 @@ postcss@^6.0.1: source-map "^0.6.1" supports-color "^4.4.0" -prebuild-install@^2.2.2: - version "2.4.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.4.1.tgz#c28ba1d1eedc17fbd6b3229a657ffc0fba479b49" +prebuild-install@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.3.0.tgz#19481247df728b854ab57b187ce234211311b485" dependencies: expand-template "^1.0.2" github-from-package "0.0.0" @@ -7087,10 +7083,11 @@ prebuild-install@^2.2.2: tunnel-agent "^0.6.0" xtend "4.0.1" -prebuild-install@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.3.0.tgz#19481247df728b854ab57b187ce234211311b485" +prebuild-install@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.0.tgz#6fdd8436069971c76688071f4847d4c891a119f4" dependencies: + detect-libc "^1.0.3" expand-template "^1.0.2" github-from-package "0.0.0" minimist "^1.2.0"