From cdc44b89d2f03dc9b5c65b187426f7460bcb8f27 Mon Sep 17 00:00:00 2001
From: jsm174 <jsm174@gmail.com>
Date: Fri, 4 Jun 2021 20:53:06 -0400
Subject: [PATCH] ci: consolidate build workflow

---
 .github/workflows/MaterialPatcher.yml         | 35 ------------------
 .github/workflows/build.yml                   | 36 +++++++++++++++++++
 .../VisualPinball.MaterialPatcher.csproj      |  2 +-
 VisualPinball.TableScript/Program.cs          |  2 +-
 .../VisualPinball.TableScript.csproj          |  2 +-
 5 files changed, 39 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/MaterialPatcher.yml
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/MaterialPatcher.yml b/.github/workflows/MaterialPatcher.yml
deleted file mode 100644
index 9f4b23b..0000000
--- a/.github/workflows/MaterialPatcher.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: MaterialPatcher
-on:
-  push:
-
-jobs:
-  build-win-x64:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '3.1.x'
-      - name: Build
-        run: |
-          cd VisualPinball.MaterialPatcher
-          dotnet publish -r win-x64 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true
-      - uses: actions/upload-artifact@v2
-        with:
-          name: material-patcher-x64
-          path: VisualPinball.MaterialPatcher/bin/Release/netcoreapp3.1/win-x64/publish/VisualPinball.MaterialPatcher.exe
-  build-win-x86:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '3.1.x'
-      - name: Build
-        run: |
-          cd VisualPinball.MaterialPatcher
-          dotnet publish -r win-x86 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true
-      - uses: actions/upload-artifact@v2
-        with:
-          name: material-patcher-x86
-          path: VisualPinball.MaterialPatcher/bin/Release/netcoreapp3.1/win-x86/publish/VisualPinball.MaterialPatcher.exe
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..8f28e64
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,36 @@
+name: Build
+on: [ push, pull_request ]
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    name: Build ${{ matrix.app }}-${{ matrix.rid }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { app: VisualPinball.MaterialPatcher, os: windows-latest, rid: win-x64, ext: .exe }
+          - { app: VisualPinball.MaterialPatcher, os: windows-latest, rid: win-x86, ext: .exe }
+          - { app: VisualPinball.MaterialPatcher, os: macos-latest, rid: osx-x64 }
+          - { app: VisualPinball.MaterialPatcher, os: ubuntu-18.04, rid: linux-x64 }
+          - { app: VisualPinball.TableScript, os: windows-latest, rid: win-x64, ext: .exe }
+          - { app: VisualPinball.TableScript, os: windows-latest, rid: win-x86, ext: .exe }
+          - { app: VisualPinball.TableScript, os: macos-latest, rid: osx-x64 }
+          - { app: VisualPinball.TableScript, os: ubuntu-18.04, rid: linux-x64 }
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+      - name: Build ${{ matrix.app }}-${{ matrix.rid }}
+        run: |
+          cd ${{ matrix.app }}
+          dotnet publish -r ${{ matrix.rid }} -c Release -p:PublishSingleFile=true -p:PublishTrimmed=true
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.app }}-${{ matrix.rid }}
+          path: ${{ matrix.app }}/bin/Release/netcoreapp3.1/${{ matrix.rid }}/publish/${{ matrix.app }}${{ matrix.ext }}
diff --git a/VisualPinball.MaterialPatcher/VisualPinball.MaterialPatcher.csproj b/VisualPinball.MaterialPatcher/VisualPinball.MaterialPatcher.csproj
index d0673f5..789c17e 100644
--- a/VisualPinball.MaterialPatcher/VisualPinball.MaterialPatcher.csproj
+++ b/VisualPinball.MaterialPatcher/VisualPinball.MaterialPatcher.csproj
@@ -7,7 +7,7 @@
 		<Company>Visual Pinball Engine</Company>
 		<Product>Material Patcher</Product>
 		<AssemblyVersion>0.0.3.0</AssemblyVersion>
-		<FileVersion>0.0.3.0-SNAPSHOT</FileVersion>
+		<FileVersion>0.0.3.0</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/VisualPinball.TableScript/Program.cs b/VisualPinball.TableScript/Program.cs
index d60ba83..4d00b1c 100644
--- a/VisualPinball.TableScript/Program.cs
+++ b/VisualPinball.TableScript/Program.cs
@@ -39,7 +39,7 @@ static void Main(string[] args)
 				foreach (var inputFile in inputFiles) {
 					Console.WriteLine($"Processing \"{inputFile}\"...");
 
-					var inputTable = TableLoader.Load(inputFile);
+					var inputTable = TableLoader.Load(inputFile, false);
 
 					var code = inputTable.Data.Code;
 
diff --git a/VisualPinball.TableScript/VisualPinball.TableScript.csproj b/VisualPinball.TableScript/VisualPinball.TableScript.csproj
index 3bc4641..8675afa 100644
--- a/VisualPinball.TableScript/VisualPinball.TableScript.csproj
+++ b/VisualPinball.TableScript/VisualPinball.TableScript.csproj
@@ -7,7 +7,7 @@
 		<Company>Visual Pinball Engine</Company>
 		<Product>Table Script</Product>
 		<AssemblyVersion>0.0.3.0</AssemblyVersion>
-		<FileVersion>0.0.3.0-SNAPSHOT</FileVersion>
+		<FileVersion>0.0.3.0</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>