diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-06-04 13:09:38 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-06-04 13:09:38 +0200 |
| commit | e093f0b8d2cd1be754147151f566d092d57006ba (patch) | |
| tree | dc01e28451ed5234cda3bfa8781065cbab0991f2 | |
| parent | 686e1573604f3410f545d105611c0ac78c5fc516 (diff) | |
| parent | e453adbedf96d3bec80ebba26428f86a623f398b (diff) | |
| download | mullvadvpn-e093f0b8d2cd1be754147151f566d092d57006ba.tar.xz mullvadvpn-e093f0b8d2cd1be754147151f566d092d57006ba.zip | |
Merge branch 'fix-prepare-release-package-lock'
| -rw-r--r-- | gui/package-lock.json | 12 | ||||
| -rwxr-xr-x | prepare_release.sh | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gui/package-lock.json b/gui/package-lock.json index 313b685072..f117eb9b30 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -7228,18 +7228,18 @@ "integrity": "sha512-8Gr8WHInZt5oU1q2N7ANqLSZ/TJn6bYlkqkwJJoGowFc5l81DRORgtHH9eJUpJGJsGJgYyWeVfKGVtUdTu4TEQ==" }, "tar": { - "version": "4.4.8", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", - "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "version": "4.4.9", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.9.tgz", + "integrity": "sha512-xisFa7Q2i3HOgfn+nmnWLGHD6Tm23hxjkx6wwGmgxkJFr6wxwXnJOdJYcZjL453PSdF0+bemO03+flAzkIdLBQ==", "optional": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", + "minipass": "^2.3.5", + "minizlib": "^1.2.1", "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "yallist": "^3.0.3" } }, "temp-file": { diff --git a/prepare_release.sh b/prepare_release.sh index d77952b042..8a628e15c5 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -42,9 +42,12 @@ echo "Syncing Cargo.lock with new version numbers" source env.sh "" cargo build +(cd gui/ && npm install) || exit 1 + echo "Commiting metadata changes to git..." git commit -S -m "Updating version in package files" \ gui/package.json \ + gui/package-lock.json \ mullvad-daemon/Cargo.toml \ mullvad-cli/Cargo.toml \ mullvad-problem-report/Cargo.toml \ |