Merge branch 'master' into feature/simplify-tests

thislooksfun · Dec 5, 2019 · cc665c7 · cc665c7
2 parents 64cbfac + 9b9ed5c
commit cc665c7
Showing 1 changed file with 18 additions and 37 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,50 +10,31 @@ on:
     types: [published, created, edited, prereleased]
 
 jobs:
-  # Windows
-  build-win:
-    name: Build (Windows)
-    runs-on: windows-latest
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # os: [windows-latest, macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
+      fail-fast: false
     steps:
       # Setup
       - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 12.x
       - run: npm install
 
       # Build
-      - run: npm run electron:build -- -w # -p always
+      - name: Build for Windows
+        if: matrix.os == windows-latest
+        run: npm run electron:build -- -w # -p always
 
-  # macOS
-  build-mac:
-    name: Build (macOS)
-    runs-on: macos-latest
-    steps:
-      # Setup
-      - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: npm install
-
-      # Build
-      - run: npm run electron:build -- -m # -p always
+      - name: Build for macOS
+        if: matrix.os == macos-latest
+        run: npm run electron:build -- -m # -p always
 
-  # Linux
-  build-linux:
-    name: Build (Linux)
-    runs-on: ubuntu-latest
-    steps:
-      # Setup
-      - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: npm install
-
-      # Build
-      - run: npm run electron:build -- -l # -p always
+      - name: Build for Linux
+        if: matrix.os == linux-latest
+        run: npm run electron:build -- -l # -p always