Merge pull request #193 from loki-project/development

v.1.4.6 Bug fixes and service node min/max

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - development
 
 jobs:
   build:
@@ -16,28 +17,36 @@ jobs:
       - name: Checkout git repo
         uses: actions/checkout@v1
 
+      # Read node version from `.nvmrc` file
+      - name: Read nvm rc
+        id: nvmrc
+        uses: browniebroke/read-nvmrc-action@v1
+
       - name: Install node
         uses: actions/setup-node@v1
         with:
-          node-version: "11.9.0"
+          node-version: ${{ steps.nvmrc.outputs.node_version }}
 
       - name: Install dependencies
         run: npm install
 
       - name: Download lokid binaries
-        run: node ./build/download-binaries.js
+        run: ./download-asset.sh
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          OS: ${{ runner.os }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        working-directory: ./downloads
 
       - name: Extract zip binaries
         if: runner.os != 'Linux'
-        run: unzip latest.zip
+        run: unzip latest
         shell: bash
         working-directory: ./downloads
 
       - name: Extract xz binaries
         if: runner.os == 'Linux'
-        run: tar -xf latest.xz
+        run: tar -xf latest
         shell: bash
         working-directory: ./downloads
 
@@ -51,15 +60,15 @@ jobs:
         run: ls ./bin
         shell: bash
 
-      - name: Publish window and linux binaries
+      - name: Build window and linux binaries
         if: runner.os != 'macOS'
-        run: npm run release
+        run: npm run build
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Publish mac binaries
+      - name: Build mac binaries
         if: runner.os == 'macOS'
-        run: npm run release
+        run: npm run build
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CSC_LINK: ${{ secrets.MAC_CERTIFICATE }}

.github/workflows/release.yml

@@ -0,0 +1,77 @@
+name: Loki Electron Wallet Release
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-latest, ubuntu-latest]
+    steps:
+      - name: Checkout git repo
+        uses: actions/checkout@v1
+
+      # Read node version from `.nvmrc` file
+      - name: Read nvm rc
+        id: nvmrc
+        uses: browniebroke/read-nvmrc-action@v1
+
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ steps.nvmrc.outputs.node_version }}
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Download lokid binaries
+        run: ./download-asset.sh
+        env:
+          OS: ${{ runner.os }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        working-directory: ./downloads
+
+      - name: Extract zip binaries
+        if: runner.os != 'Linux'
+        run: unzip latest.zip
+        shell: bash
+        working-directory: ./downloads
+
+      - name: Extract xz binaries
+        if: runner.os == 'Linux'
+        run: tar -xf latest.xz
+        shell: bash
+        working-directory: ./downloads
+
+      - name: Move lokid binaries
+        run: |
+          find ./downloads -type f -name "lokid*" -exec cp '{}' ./bin \;
+          find ./downloads -type f -name "loki-wallet-rpc*" -exec cp '{}' ./bin \;
+        shell: bash
+
+      - name: Verify binaries
+        run: ls ./bin
+        shell: bash
+
+      - name: Publish window and linux binaries
+        if: runner.os != 'macOS'
+        run: npm run release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish mac binaries
+        if: runner.os == 'macOS'
+        run: npm run release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CSC_LINK: ${{ secrets.MAC_CERTIFICATE }}
+          CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
+          SIGNING_APPLE_ID: ${{ secrets.SIGNING_APPLE_ID }}
+          SIGNING_APP_PASSWORD: ${{ secrets.SIGNING_APP_PASSWORD }}
+          SIGNING_TEAM_ID: ${{ secrets.SIGNING_TEAM_ID }}

.gitignore

@@ -28,6 +28,7 @@ bin/*
 
 .env
 
-/downloads
+downloads/*
+!downloads/*.sh
 
 dev-app-update.yml

.nvmrc

@@ -1 +1 @@
-11.9.0
+14.11.0

.prettierrc.js

@@ -1,5 +1 @@
-// Must be included inside .stylintrc, otherwise will conflict and cause weird
-// linting errors
-module.exports = {
-  printWidth: 120
-};
+// intentionally blank

.stylintrc

@@ -32,5 +32,4 @@
     "valid": true,
     "zeroUnits": "never",
     "zIndexNormalize": false,
-    "printWidth": 120
 }

README.md

@@ -23,10 +23,10 @@ Please submit any changes as pull requests to the development branch, all change
 #### Commands
 
 ```
-nvm use 11.9.0
-npm install -g quasar-cli
+nvm use 14.11.0
+npm install -g @quasar/cli
 git clone https://github.com/loki-project/loki-electron-gui-wallet
-cd loki-electron-wallet
+cd loki-electron-gui-wallet
 cp path_to_lokid_binaries/lokid bin/
 cp path_to_lokid_binaries/loki-wallet-rpc bin/
 npm install

downloads/download-asset.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+# Source from: https://github.com/houqp/download-release-assets-action
+
+set -e
+
+if [ -z "$OS" ]; then
+    echo "OS must be set"
+    exit 1
+fi
+
+if [ -z "$RENAME" ]; then
+    RENAME="latest"
+fi
+
+REPO="loki-project/loki-core"
+RELEASE="latest"
+
+if [ "$OS" == "Linux" ]; then
+    FILE_NAME_REGEX="linux"
+elif [ "$OS" == "Windows" ]; then
+    FILE_NAME_REGEX="win"
+elif [ "$OS" == "macOS" ]; then
+    FILE_NAME_REGEX="osx"
+else
+    echo "OS must be Linux, Windows or macOS"
+    exit 1
+fi
+
+
+ASSET_URL=$(curl -sL --fail \
+    -H "Accept: application/vnd.github.v3+json" \
+    -H "Authorization: Bearer ${GITHUB_TOKEN}" \
+    "https://api.github.com/repos/${REPO}/releases/${RELEASE}" \
+    | jq -r ".assets | .[] | select(.name | test(\"${FILE_NAME_REGEX}\")) | .url")
+
+curl -sL --fail \
+    -H "Accept: application/octet-stream" \
+    -H "Authorization: Bearer ${GITHUB_TOKEN}" \
+    -o "${RENAME}" \
+    "$ASSET_URL"