Merge pull request #91 from gorilla-devs/develop

v0.6.8

.gitignore

@@ -52,3 +52,4 @@ main.js.map
 
 .idea
 npm-debug.log.*
+log.txt

.travis.yml

@@ -23,14 +23,20 @@ matrix:
         # This should fix https://github.com/travis-ci/travis-ci/issues/9630
         - sudo chown -R travis:travis $HOME/.cache
         - sudo chown -R travis:travis $TRAVIS_BUILD_DIR/node_modules
+    - os: osx
+      osx_image: xcode9.4
+      language: node_js
+      node_js:
+        - node
+        - 9
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
       before_deploy:
         # Removing unpacked builds before deploy
         - sudo rm -rf $TRAVIS_BUILD_DIR/release/win-unpacked
         - sudo rm -rf $TRAVIS_BUILD_DIR/release/linux-unpacked
         - sudo chown -R travis:travis $TRAVIS_BUILD_DIR/release
-        - sudo ls -l
-        - cd release
-        - sudo ls -l
         # - node $TRAVIS_BUILD_DIR/scripts/preDeploy.js
       deploy:
           provider: releases
@@ -41,18 +47,9 @@ matrix:
           file:
             - "$TRAVIS_BUILD_DIR/release/GDLauncher-win.zip"
             - "$TRAVIS_BUILD_DIR/release/GDLauncher-linux.zip"
+            - "$TRAVIS_BUILD_DIR/release/GDLauncher-mac.zip"
           on:
             tags: true
-    - os: osx
-      osx_image: xcode9.4
-      language: node_js
-      node_js:
-        - node
-        - 9
-      env:
-        - ELECTRON_CACHE=$HOME/.cache/electron
-        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
-
 cache:
   directories:
     - node_modules
@@ -89,20 +86,4 @@ before_script:
 
 script:
   - npm run package
-#  - yarn lint
-#  - yarn flow
-#  - yarn test
-#  - yarn test-e2e
-  # On Linux, check if packaging to windows works
-  - |
-    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-      docker run --rm \
-        --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
-        -v ${PWD}:/project \
-        -v ~/.cache/electron:/root/.cache/electron \
-        -v ~/.cache/electron-builder:/root/.cache/electron-builder \
-        electronuserland/builder:wine \
-        /bin/bash -c "npm run package-win"
-    else
-      :
-    fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run package-all; fi

.vscode/tasks.json

@@ -0,0 +1,16 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "dev",
+      "problemMatcher": [],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    }
+  ]
+}