Browse Source

Merge pull request #1346 from LedgerHQ/master

Master
master
Gaëtan Renaudeau 7 years ago
committed by GitHub
parent
commit
295a0f5b03
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      package.json
  2. 10
      scripts/release.sh
  3. 14
      yarn.lock

2
package.json

@ -3,7 +3,7 @@
"productName": "Ledger Live", "productName": "Ledger Live",
"description": "Ledger Live - Desktop", "description": "Ledger Live - Desktop",
"repository": "https://github.com/LedgerHQ/ledger-live-desktop", "repository": "https://github.com/LedgerHQ/ledger-live-desktop",
"version": "1.0.7", "version": "1.1.0-rc.3",
"author": "Ledger", "author": "Ledger",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {

10
scripts/release.sh

@ -46,11 +46,11 @@ if ! git diff-index --quiet HEAD --; then
exit 1 exit 1
fi fi
originRemote=$(git config --get remote.origin.url) # originRemote=$(git config --get remote.origin.url)
if [ "$originRemote" != "https://github.com/LedgerHQ/ledger-live-desktop.git" ]; then # if [ "$originRemote" != "https://github.com/LedgerHQ/ledger-live-desktop.git" ]; then
echo "the origin remote is incorrect ($originRemote)" # echo "the origin remote is incorrect ($originRemote)"
exit 1 # exit 1
fi # fi
runJob "yarn compile" "compiling..." "compiled" "failed to compile" "verbose" runJob "yarn compile" "compiling..." "compiled" "failed to compile" "verbose"

14
yarn.lock

@ -1501,11 +1501,11 @@
"@ledgerhq/hw-transport" "^4.21.0" "@ledgerhq/hw-transport" "^4.21.0"
bip32-path "0.4.2" bip32-path "0.4.2"
"@ledgerhq/hw-transport-node-hid@4.22.0-beta.a1987cb3": "@ledgerhq/hw-transport-node-hid@4.22.0":
version "4.22.0-beta.a1987cb3" version "4.22.0"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.22.0-beta.a1987cb3.tgz#89dd5b30239ed81e41fd3a1a37a48d5e9cd8529b" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.22.0.tgz#1ee00dcccd852cb6fb152cd68c781c9689cf9f24"
dependencies: dependencies:
"@ledgerhq/hw-transport" "^4.22.0-beta.a1987cb3" "@ledgerhq/hw-transport" "^4.21.0"
lodash "^4.17.10" lodash "^4.17.10"
node-hid "^0.7.2" node-hid "^0.7.2"
usb "^1.3.2" usb "^1.3.2"
@ -1529,12 +1529,6 @@
dependencies: dependencies:
events "^2.0.0" events "^2.0.0"
"@ledgerhq/hw-transport@^4.22.0-beta.a1987cb3":
version "4.22.0-beta.ae6f5c51"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.22.0-beta.ae6f5c51.tgz#a9f17ff8fa792a19e01d82d72f14ff7f7a211209"
dependencies:
events "^2.0.0"
"@ledgerhq/ledger-core@2.0.0-rc.5": "@ledgerhq/ledger-core@2.0.0-rc.5":
version "2.0.0-rc.5" version "2.0.0-rc.5"
resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.5.tgz#ec42f6c3cc265fc5ca82e01d27df38357642d3ed" resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.5.tgz#ec42f6c3cc265fc5ca82e01d27df38357642d3ed"

Loading…
Cancel
Save