Fix deployment scripts

slept-yogurt · Oct 25, 2019 · ff1b574 · ff1b574
1 parent e9f9aac
commit ff1b574
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/bin/deploy_node_modules b/bin/deploy_node_modules
@@ -16,11 +16,8 @@ set -o pipefail
 set -o nounset
 
 function push_packages_on_npm {
-    grep --fixed-strings --line-regexp --silent "//registry.npmjs.org/:_authToken=$NPM_TOKEN"  ~/.npmrc
-    if [ $? == 1 ]
-    then
-        echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
-    fi
+    touch ~/.npmrc
+    grep --fixed-strings --line-regexp --silent "//registry.npmjs.org/:_authToken=$NPM_TOKEN"  ~/.npmrc || echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
     projects="lesspass lesspass-crypto lesspass-entropy lesspass-fingerprint lesspass-pure lesspass-render-password"
     for project in ${projects}
     do

diff --git a/bin/deploy_web_extensions b/bin/deploy_web_extensions
@@ -16,6 +16,7 @@ set -o pipefail
 set -o nounset
 
 function release_web_extensions {
+    yarn install
     yarn workspace lesspass-web-extension run release
     VERSION=$(grep -Po '(?<="version": ")[^"]*' package.json)
     echo "Download sources on https://github.com/lesspass/lesspass/releases/tag/${VERSION}"

diff --git a/bin/release b/bin/release
@@ -19,12 +19,17 @@ function check_repository_is_clean {
     git remote update
     git add .
     git status
-    git diff-index --quiet HEAD --;
+    git diff-index --quiet HEAD
     if [ $? == 1 ]
     then
         print_error "Git repository not clean. Aborting."
         exit 1
     fi
+    if [ $(git rev-parse HEAD) != $(git rev-parse @{u}) ]
+    then
+        print_error "Git branch diverged. Aborting."
+        exit 1
+    fi
 }
 
 function check_branch_is_master {
@@ -116,7 +121,7 @@ function build_web_extensions {
 
 function build_mobile_app {
     pushd mobile/android/
-    ./gradlew assembleRelease
+    ./gradlew bundleRelease
     popd
 }
 

diff --git a/package.json b/package.json
@@ -60,6 +60,7 @@
     "vue-polyglot-utils": "^0.1.1",
     "vue-template-compiler": "^2.6.10",
     "walk": "^2.3.14",
+    "web-ext": "^3.2.0",
     "web-ext-submit": "^3.1.0",
     "webpack": "^4.35.3",
     "webpack-cli": "^3.3.6",