From 1bb7d30ea0dbd2f55563aea8a452c8e99292cb0e Mon Sep 17 00:00:00 2001
From: Senn Geerts <Senn.Geerts@belden.com>
Date: Sat, 13 Jul 2024 14:03:16 +0200
Subject: [PATCH] #196 fix wrong ci.yml merge

---
 .github/workflows/ci.yaml | 55 ++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5eada2d5..ec47f69c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,7 +1,4 @@
-# Note: ci.yaml and release.yaml have some similar steps
-#       If updating dotnet-version, set in both.
-
-name: CI
+name: ci
 
 on:
   push:
@@ -10,34 +7,32 @@ on:
   pull_request:
 
 jobs:
-  build:
 
+  build:
     runs-on: ubuntu-latest
-    
     steps:
-    - uses: actions/checkout@v3
-
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 'lts/*' # latest LTS version
-    - uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: | 
-          6.0.x
-          8.0.x
+      - uses: actions/checkout@v2
+      - name: setup build
+        uses: ./.github/npm
+      - name: Run dotnet build
+        run: dotnet build --configuration Debug
 
-    - name: Run NPM install
-      run: npm ci
-      working-directory: ./src/Saunter.UI
-    - name: Run dotnet build src
-      run: dotnet build ./src/Saunter-src.slnf --configuration Debug
-    - name: Run dotnet build all
-      run: dotnet build --configuration Debug
-    - name: Run dotnet test
-      run: dotnet test --no-build
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: setup dotnet
+        uses: ./.github/dotnet
+      - name: dotnet format check
+        run: dotnet format --verify-no-changes *.sln
+        env:
+          PATH: ${{ github.env.PATH }}:/home/runner/.dotnet/tools
 
-    # Below steps run only on CI, not release
-    - uses: actions/upload-artifact@v2
-      with:
-        name: saunter-bin
-        path: ./src/Saunter/bin
+  unit-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: setup build
+        uses: ./.github/npm
+      - name: unit test
+        run: dotnet test --configuration Debug