From 6ef9bec71547af335d23185f5fac0b0661691a99 Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Fri, 16 Apr 2021 06:28:38 +0200
Subject: [PATCH] Try to find the gtest adapter, upload artifacts

---
 .github/workflows/msbuild.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index e02f709e02..d8752d9ed9 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -22,18 +22,24 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}  
 
+    - name: Find Google Test Adapter
+      run: for /f "tokens=*" %i in ('dir /s /b "C:\Program Files (x86)\Microsoft Visual Studio\GoogleTestAdapter.TestAdapter.dll"') do set GTEST_ADAPTER_PATH=%%~dpi
+      shell: cmd
+
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=x64 /maxcpucount:4 /nodeReuse:false /p:UseSharedConfiguration=false ${{env.SOLUTION_FILE_PATH}}
-
-    - name: Find Google Test Adapter
-      run: for /f "tokens=*" %i in ('dir /s /b "C:\Program Files (x86)\Microsoft Visual Studio\GoogleTestAdapter.TestAdapter.dll"') do set GTEST_ADAPTER_PATH=%~dpi
-      shell: cmd
       
-    - name: Run Google Tests
+    - name: Run Unit Tests
       run: vstest.console.exe ${{env.TESTS_FILE_PATH}} /Platform:x64 /Logger:trx /TestAdapterPath:"${{env.GTEST_ADAPTER_PATH}}"
     
     - name: Generate Portable Package
       run: powershell -ExecutionPolicy ByPass .\compile_release_package.ps1 -Platform x64 -SkipBuild -GenerateSetupPackage:$false -GeneratePortablePackage:$true -OutputFolder ..\..\PortablePackage\
       shell: cmd
       working-directory: .\tools\scripts
+
+    - name: Upload Portable Package
+      uses: actions/upload-artifact@v2
+      with:
+        name: portable-package-x64
+        path: ../../PortablePackage/*.7z