Merge branch 'develop' of https://github.com/Superalgos/Superalgos into develop

2021-10-19 16:36:16 +02:00
commit a9570d699b
@@ -1,9 +1,14 @@
-name: Build/release
+name: Build/release Binaries

 on: 
  push: 
+    branches: [master]
    tags: 
      - '*'
+    release:
+      types: [published, created, edited]
+
+  workflow_dispatch:

 jobs:
  release:
@@ -28,7 +33,8 @@ jobs:
          # GitHub token, automatically provided to the action
          # (No need to define this secret in the repo settings)
          github_token: ${{ secrets.github_token }}
+          args: "-c.extraMetadata.main=electron-wrapper.js -c build/electron-builder.json"

          # If the commit is tagged with a version (e.g. "v1.0.0"),
          # release the app after building
-          release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+          release: ${{ startsWith(github.ref, 'refs/tags/') }}
@@ -0,0 +1,80 @@
+name: Nightly develop Binaries
+
+on:
+  schedule:
+    - cron:  '20 3 * * *'
+
+  workflow_dispatch:
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download a file
+        run: curl "https://raw.githubusercontent.com/${{ github.repository }}/develop/package.json" -o package.json
+
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y%m%d')"
+
+      - name: get-version
+        id: version
+        uses: nyaa8/package-version@v1
+        with:
+          path: './package.json'
+
+      - name: Create nightly release
+        id: create_release
+        uses: viperproject/create-nightly-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.PACKAGE_VERSION }}.${{ steps.date.outputs.date }}
+          release_name: Superalgos ${{ env.PACKAGE_VERSION }} Snapshot ${{ steps.date.outputs.date }}
+          keep_num: 5
+          keep_tags: false
+
+  build-release:
+    runs-on: ${{ matrix.os }}
+    needs: create-release
+    strategy:
+        matrix:
+          os: [windows-latest, macos-latest]
+
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y%m%d')"
+
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+        with:
+          ref: develop
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14
+
+      - name: get-version
+        id: version
+        uses: nyaa8/package-version@v1
+        with:
+          path: './package.json'
+
+      - name: Build/release Electron app
+        #env:
+        #  DATE: ${{ steps.date.outputs.date }}
+        uses: samuelmeuli/action-electron-builder@v1
+        with:
+          # GitHub token, automatically provided to the action
+          # (No need to define this secret in the repo settings)
+          github_token: ${{ secrets.github_token }}
+          args: "-c.extraMetadata.main=electron-wrapper.js -c.extraMetadata.version=${{ env.PACKAGE_VERSION }}.${{ steps.date.outputs.date }} -c build/electron-builder.json -p onTagOrDraft"
+
+          # If the commit is tagged with a version (e.g. "v1.0.0"),
+          # release the app after building
+          # release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+          release: true
+ 
+
@@ -84,6 +84,9 @@ You can use the windows installer (Setup file) which will install all the necess
 > **NOTE**
 > There's a known issue where the screen stays white. In this case, go to "View/Reload" and it should work. 

+> **NOTE**
+> The application is not signed yet. The antivirus probably will flag the file as unsecure. You can force the installation and running or way for the signed app. 
+
 The manual installation option, tailored for users who are experienced and who want to contribute to the project (highly appreciated and rewarded with SA tokens). Follow the install wizards to install the latest NodeJS and Github Desktop applications.

 - [Node.js download page](https://nodejs.org/en/download/). Select "Current" then "Windows Installer", then follow the wizard to install after the download completes.
@@ -93,6 +96,11 @@ The manual installation option, tailored for users who are experienced and who w

 ### Mac OS Install

+You can use the MacOS installer (DMG file) which will install all the necessary dependencies and files for you to run the platform. Also the shortcuts are placed. This application will notify you and update as new releases come (to be released).
+
+> **NOTE**
+> The application is not signed. To be able to run you have to permit it in System Preferences > Security & Privacy > General > Open Anyway. 
+
 [Homebrew](https://brew.sh/) can be used to install the requirements with minimal effort on Mac OS.  After you clone the repository, change directory to the Superalgos base and install the requirements using the Brewfile. Python 3 is only required for running machine learning (TensorFlow).

 ```sh
@@ -0,0 +1,52 @@
+{
+    "appId": "org.superalgos.platform",
+    "productName": "Superalgos",
+    "asar": false,
+    "generateUpdatesFilesForAllChannels": true,
+    "files": [
+      "**/*",
+      "!.github",
+      "!.vscode",
+      "!.dockerignore${/*}",
+      "!Platform/My-Data-Storage/*",
+      "!Platform/My-Log-Files/*",
+      "!Platform/My-Workspaces/*",
+      "!Docker",
+      "!Launch-Scripts",
+      "!run.js",
+      "!setup.js",
+      "!uninstall.js"
+    ],
+    "win": {
+      "target": [
+        {
+          "target": "nsis",
+          "arch": "x64"
+        }
+      ],
+      "artifactName": "${productName}-${os}-${version}.${ext}",
+      "icon": "./build/superalgos.ico"
+    },
+    "publish": {
+      "provider": "github",
+      "vPrefixedTagName": false,
+      "releaseType": "prerelease"
+    },
+    "nsis": {
+      "oneClick": false,
+      "perMachine": false,
+      "allowElevation": false,
+      "allowToChangeInstallationDirectory": true,
+      "createDesktopShortcut": true,
+      "createStartMenuShortcut": true,
+      "license": "./LICENSE",
+      "runAfterFinish": false,
+      "artifactName": "${productName}_Setup_${os}_${version}.${ext}"
+    },
+    "mac": {
+      "artifactName": "${productName}-${os}-${version}.${ext}",
+      "category": "public.app-category.finance",
+      "target": "default",
+      "icon": "build/icon.icns"
+    }
+}
@@ -2,7 +2,6 @@
  "name": "superalgos",
  "version": "0.0.12-beta",
  "description": "Superalgos is a free, open-source crypto trading bot",
-  "main": "electron-wrapper.js",
  "license": "Apache License 2.0",
  "homepage": "https://www.superalgos.org/",
  "author": {
@@ -11,7 +10,7 @@
  "scripts": {
    "start": "node platform minMemo noBrowser",
    "setup": "node setup noShortcuts",
-    "release": "electron-builder -w",
+    "dist": "electron-builder",
    "postinstall": "electron-builder install-app-deps"
  },
  "dependencies": {
@@ -39,48 +38,5 @@
  "devDependencies": {
    "electron": "^15.1.0",
    "electron-builder": "^22.11.7"
-  },
-  "build": {
-    "appId": "org.superalgos.platform",
-    "productName": "Superalgos",
-    "asar": false,
-    "files": [
-      "**/*",
-      "!.github",
-      "!.vscode",
-      "!.dockerignore${/*}",
-      "!Platform/My-Data-Storage/*",
-      "!Platform/My-Log-Files/*",
-      "!Platform/My-Workspaces/*",
-      "!Docker",
-      "!Launch-Scripts",
-      "!run.js",
-      "!setup.js",
-      "!uninstall.js"
-    ],
-    "win": {
-      "target": [
-        {
-          "target": "nsis",
-          "arch": "x64"
-        }
-      ],
-      "icon": "./build/superalgos.ico"
-    },
-    "nsis": {
-      "oneClick": false,
-      "perMachine": false,
-      "allowElevation": false,
-      "allowToChangeInstallationDirectory": true,
-      "createDesktopShortcut": true,
-      "createStartMenuShortcut": true,
-      "license": "./LICENSE",
-      "runAfterFinish": false
-    },
-    "mac": {
-      "category": "public.app-category.finance",
-      "target": "default",
-      "icon": "build/icon.icns"
-    }
  }
 }