From db669789bda8722266dc62d8123ed5d6f39ca8f3 Mon Sep 17 00:00:00 2001
From: Robert Andersson <robert.andersson.swe@gmail.com>
Date: Sun, 11 Oct 2020 14:25:48 +0200
Subject: [PATCH] Merge unit test with deploy file

---
 .github/workflows/publish-Sharpy.yml | 14 ++++++++++++++
 .github/workflows/test.yml           | 20 --------------------
 2 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/publish-Sharpy.yml b/.github/workflows/publish-Sharpy.yml
index 45df4a2a..d5893d9b 100644
--- a/.github/workflows/publish-Sharpy.yml
+++ b/.github/workflows/publish-Sharpy.yml
@@ -4,6 +4,20 @@ on:
     branches:
       - master # Default release branch
 jobs:
+  build:
+    name: Test project
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 3.1.100
+      - name: Build
+        run: dotnet build --configuration Release
+      - name: Test
+        run: dotnet test --no-build --configuration Release
   publish:
     name: build, pack & publish
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 00b98b0c..00000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-  
-name: Test
-
-on: [push]
-
-jobs:
-  build:
-    name: Test project
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.100
-    - name: Build
-      run: dotnet build --configuration Release
-    - name: Test
-      run: dotnet test --no-build --configuration Release