From e2f2badc29747326d517564a9933a0da61ed6127 Mon Sep 17 00:00:00 2001
From: Webber <webber@takken.io>
Date: Thu, 30 Jan 2020 08:46:02 +0100
Subject: [PATCH] Update workflow to use with instead of env

---
 .github/workflows/main.yml | 35 +++++++++++++++--------------------
 action/steps/run_tests.sh  |  2 +-
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e7fb184..6748f43 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,10 +54,9 @@ jobs:
         uses: ./
         with:
           unityVersion: ${{ matrix.unityVersion }}
-        env:
-          TEST_MODE: all
-          PROJECT_PATH: ${{ matrix.projectPath }}
-          # Test implicit ARTIFACTS_PATH, by not setting it
+          testMode: all
+          projectPath: ${{ matrix.projectPath }}
+          # Test implicit artifactsPath, by not setting it
 
       # Upload artifacts
       - name: Upload test results
@@ -99,10 +98,9 @@ jobs:
         uses: ./
         with:
           unityVersion: ${{ matrix.unityVersion }}
-        env:
-          TEST_MODE: editmode
-          PROJECT_PATH: ${{ matrix.projectPath }}
-          ARTIFACTS_PATH: artifacts/editmode
+          testMode: editmode
+          projectPath: ${{ matrix.projectPath }}
+          artifactsPath: artifacts/editmode
 
       # Upload artifacts
       - name: Upload test results
@@ -144,10 +142,9 @@ jobs:
         uses: ./
         with:
           unityVersion: ${{ matrix.unityVersion }}
-        env:
-          TEST_MODE: playmode
-          PROJECT_PATH: ${{ matrix.projectPath }}
-          ARTIFACTS_PATH: artifacts/editmode
+          testMode: playmode
+          projectPath: ${{ matrix.projectPath }}
+          artifactsPath: artifacts/playmode
 
       # Upload artifacts
       - name: Upload test results
@@ -188,20 +185,18 @@ jobs:
         uses: ./
         with:
           unityVersion: ${{ matrix.unityVersion }}
-        env:
-          TEST_MODE: editmode
-          PROJECT_PATH: ${{ matrix.projectPath }}
-          ARTIFACTS_PATH: artifacts/editmode
+          testMode: editmode
+          projectPath: ${{ matrix.projectPath }}
+          artifactsPath: artifacts/editmode
 
       # Configure second test runner
       - name: Tests in playmode 📺
         uses: ./
         with:
           unityVersion: ${{ matrix.unityVersion }}
-        env:
-          TEST_MODE: playmode
-          PROJECT_PATH: ${{ matrix.projectPath }}
-          ARTIFACTS_PATH: artifacts/playmode
+          testMode: playmode
+          projectPath: ${{ matrix.projectPath }}
+          artifactsPath: artifacts/playmode
 
       # Upload combined artifacts
       - name: Upload combined test results
diff --git a/action/steps/run_tests.sh b/action/steps/run_tests.sh
index 6cdb23e..8e7b9c9 100644
--- a/action/steps/run_tests.sh
+++ b/action/steps/run_tests.sh
@@ -4,7 +4,7 @@
 # Set and display project path
 #
 
-UNITY_PROJECT_PATH=$GITHUB_WORKSPACE/$PROJECT_PATH
+UNITY_PROJECT_PATH="$GITHUB_WORKSPACE/$PROJECT_PATH"
 echo "Using project path \"$UNITY_PROJECT_PATH\"."
 
 #