Merge branch 'master' of https://github.com/FrogTheFrog/steam-rom-manager

Author: FrogTheFrog

.travis.yml

@@ -1,22 +1,70 @@
-language: node_js
 matrix:
   include:
+    - os: osx
+      if: type IN (push)
+      osx_image: xcode9.0
+      language: node_js
+      node_js: "8"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
     - os: linux
+      if: type IN (push)
+      services: docker
+      node_js: "8"
       sudo: required
-      dist: trusty
-      env: BUILD_SCRIPT=build:linux
-    - os: osx
-      env: BUILD_SCRIPT=build:mac
-node_js:
-  - 8
+      language: node_js
+
+    - os: linux
+      if: type IN (pull_request)
+      node_js: "8"
+      sudo: required
+      language: node_js
+
 cache:
   directories:
-    - node_modules
+  - node_modules
+  - $HOME/.cache/electron
+  - $HOME/.cache/electron-builder
+
+before_install:
+  - |
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.3.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.3.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1
+      export PATH="/tmp/git-lfs:$PATH"
+    fi
+
 install:
   - npm install
-script:
+
+before_script:
+  - git lfs pull
   - npm run build:dist
-  - npm run ${BUILD_SCRIPT}
+
+script:
+  - |
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+      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 build:docker"
+      else
+        npm run build:mac
+      fi
+    fi
+
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder/wine
+
+branches:
+  except:
+    - "/^v\\d+\\.\\d+\\.\\d+$/"
+
 notifications:
   email:
     on_success: never

README.md

@@ -4,6 +4,8 @@ Visit [Steam ROM Manager](https://frogthefrog.github.io/steam-rom-manager)'s git
 
 # For developers
 
+[![Build Status](https://travis-ci.org/FrogTheFrog/steam-rom-manager.svg?branch=v2.2.5)](https://travis-ci.org/FrogTheFrog/steam-rom-manager)
+
 To compile this app, you'll need the latest `Node.js` and `npm`. Every script will need to be run from project directory.
 
 Before running any scripts, dependencies must be installed using:
@@ -27,6 +29,7 @@ All script must be run using `npm run` command. For example, `npm run watch:rend
 |`build:dist`|Runs `build:main` and `build:renderer`|
 |`build:win`|Compiles an executable installer for Windows|
 |`build:linux`|Compiles a `deb` package and `AppImage` for linux|
+|`build:docker`|`build:win` and `build:linux` joined together|
 |`build:mac`|Compiles a `dmg` package for MacOS|
 
 ## Debugging an app

appveyor.yml

@@ -59,6 +59,7 @@
     "build:dist": "rimraf dist && npm run build:main && npm run build:renderer",
     "build:win": "build --win --ia32 --x64",
     "build:linux": "build --linux --ia32 --x64",
+    "build:docker": "build --linux --win --ia32 --x64",
     "build:mac": "build --mac --ia32 --x64"
   },
   "dependencies": {

package.json

@@ -2,47 +2,54 @@
 
 Arguments which are appended to executable to produce final shortcut. Most of the time you will want to set it using provided parser variables.
 
-## Examples
-
-Here you can find examples provided by `HE Spoke`{.noWrap}, `NicholasNRG`{.noWrap} and `FrogTheFrog`{.noWrap}.
+## Examples By System
 
 ### RetroArch
 
-#### Nintendo Entertainment System (NES)
 ```
--D -f -L "${exeDir}\cores\bnes_libretro.dll" "${filePath}"
+-L "cores${/}YOUR_CORE.dll" "${filePath}"
 ```
-#### Super Nintendo Entertainment System (SNES)
+
+### Cemu (WiiU)
+
 ```
--D -f -L "${exeDir}\cores\snes9x_libretro.dll" "${filePath}"
+-f -g "${filePath}"
 ```
-#### Nintendo 64 (N64)
+
+### Dolphin Emu (Gamecube and Wii)
+
 ```
--D -f -L "${exeDir}\cores\mupen64plus_libretro.dll" "${filePath}"
+--batch --exec --confirm=false "${filePath}"
 ```
-#### Sega Genesis
+
+### Project64 2.3+ (N64)
+
 ```
--D -f -L "${exeDir}\cores\genesis_plus_gx_libretro.dll" "${filePath}"
+"${filePath}"
 ```
-#### Sega CD
+
+### Mupen64+ (N64)
+
 ```
--D -f -L "${exeDir}\cores\genesis_plus_gx_libretro.dll" "${filePath}"
+--fullscreen "${filePath}"
 ```
-#### Sony Playstation
+
+### DeSmuME (Nintendo DS)
+
 ```
--D -f -L "${exeDir}\cores\mednafen_psx_libretro.dll" "${filePath}"
+"${filePath}"
 ```
 
-### Dolphin Emu (Gamecube and Wii)
+### mGBA (Gameboy, Gameboy Color, and Gameboy Advance)
 
 ```
---batch --exec "${filePath}"
+-f "${filePath}"
 ```
 
-### Cemu (WiiU)
+### Nestopia (NES/Famicom)
 
 ```
--f -g "${filePath}"
+"${filePath}" -video fullscreen bpp : 16 -video fullscreen width : 1024 -video fullscreen height : 768 -preferences fullscreen on start : yes -view size fullscreen : stretched 
 ```
 
 ### nullDC (Sega Dreamcast)
@@ -51,28 +58,40 @@ Here you can find examples provided by `HE Spoke`{.noWrap}, `NicholasNRG`{.noWra
 -config nullDC_GUI:Fullscreen=1 -config ImageReader:DefaultImage="${filePath}"
 ```
 
+### Kega Fusion (Sega Genesis and Sega 32X)
+
+```
+"${filePath}" -gen -auto -fullscreen
+```
+
+### RPCS3 (Sony Playstation 3)
+
+```
+"${filePath}"
+```
+
 ### PCSX2 (Sony Playstation 2)
 
 ```
 --fullscreen --nogui "${filePath}"
 ```
 
-### Kega Fusion (Sega Genesis and Sega 32X)
+### PCSX-R (Sony Playstation 1)
 
 ```
-"${filePath}" -gen -auto -fullscreen
+-nogui -cdfile "${filePath}"
 ```
 
-### Project64 2.3+ (N64)
+### ePSXe (Sony Playstation 1)
 
 ```
-"${filePath}"
+-f -nogui -loadbin "${filePath}"
 ```
 
-### Nestopia (NES/Famicom)
+### PPSSPP (Sony Playstation Portable)
 
 ```
-"${filePath}" -video fullscreen bpp : 16 -video fullscreen width : 1024 -video fullscreen height : 768 -preferences fullscreen on start : yes -view size fullscreen : stretched 
+"${filePath}"
 ```
 
 ## What does "Append arguments to executable" do?

src/lang/english/markdown/executable-arguments.md

@@ -41,6 +41,7 @@ let developmentConfig = {
 };
 
 let productionConfig = {
+    bail: process.env.TRAVIS ? JSON.parse(process.env.TRAVIS) : false
 };
 
 if (process.env.NODE_ENV === 'production')

webpack/main.js

@@ -96,6 +96,7 @@ let developmentConfig = {
 };
 
 let productionConfig = {
+    bail: process.env.TRAVIS ? JSON.parse(process.env.TRAVIS) : false,
     plugins: [
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)