update test scripts

HicServices · Dec 5, 2023 · ce4afbc · ce4afbc
1 parent 1038227
commit ce4afbc
Showing 1 changed file with 25 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -125,24 +125,21 @@ jobs:
       - name: Initialise RDMP
         run: |
             dotnet run -c Release --no-build --project Tools/rdmp/rdmp.csproj -- install --createdatabasetimeout 180 "(localdb)\MSSQLLocalDB" TEST_ -e
-      - name: Build
-        run: |
-          dotnet build --configuration Release --verbosity minimal
+      # - name: Build
+      #   run: |
+      #     dotnet build --configuration Release --verbosity minimal
       - name: Test (DB)
         shell: bash
         run: |
-            ls Rdmp.UI.Tests
-            dotnet test Rdmp.UI.Tests/Rdmp.UI.Tests.csproj --no-build -c Release
-            echo "Hello world!"
-            dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
-             # dotnet test Rdmp.UI.Tests/Rdmp.UI.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
-            # mv `find coverage -type f` db-ui.lcov
-            # mv `find coverage -type f` db-core.lcov
-      # - uses: coverallsapp/[email protected]
-      #   with:
-      #     github-token: ${{ secrets.github_token }}
-      #     files: ./db-ui.lcov ./db-core.lcov ./fs-ui.lcov ./fs-core.lcov
-      #     flag-name: unit tests
+          dotnet test Rdmp.UI.Tests/Rdmp.UI.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
+          mv `find coverage -type f` db-ui.lcov
+          dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
+          mv `find coverage -type f` db-core.lcov
+      - uses: coverallsapp/[email protected]
+        with:
+          github-token: ${{ secrets.github_token }}
+          files: ./db-ui.lcov ./db-core.lcov
+          flag-name: unit tests
   local-tests:
     name: File system tests
     runs-on: windows-latest
@@ -167,29 +164,26 @@ jobs:
       - name: Initialise RDMP
         run: |
             dotnet run -c Release --no-build --project Tools/rdmp/rdmp.csproj -- install --createdatabasetimeout 180 "(localdb)\MSSQLLocalDB" TEST_ -e
-      - name: Build
-        run: |
-          dotnet build --configuration Release --verbosity minimal
+      # - name: Build
+      #   run: |
+      #     dotnet build --configuration Release --verbosity minimal
       - name: Test with local file system
         shell: bash
         run:  |
           echo "UseFileSystemRepo: true" >> Tests.Common/TestDatabases.txt
-          dotnet test Rdmp.UI.Tests/Rdmp.UI.Tests.csproj -c Release 
-          dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj -c Release
-          # dotnet test Rdmp.UI.Tests/Rdmp.UI.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
-          # mv `find coverage -type f` fs-ui.lcov
-          # dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
-          
-          # mv `find coverage -type f` fs-core.lcov
-      # - uses: coverallsapp/[email protected]
-      #   with:
-      #     github-token: ${{ secrets.github_token }}
-      #     files: ./db-ui.lcov ./db-core.lcov ./fs-ui.lcov ./fs-core.lcov
-      #     flag-name: unit tests
+          dotnet test Rdmp.UI.Tests/Rdmp.UI.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
+          mv `find coverage -type f` fs-ui.lcov
+          dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
+          mv `find coverage -type f` fs-core.lcov
+      - uses: coverallsapp/[email protected]
+        with:
+          github-token: ${{ secrets.github_token }}
+          files: ./fs-ui.lcov ./fs-core.lcov
+          flag-name: unit tests
   bundle:
     name: Bundle Build
     runs-on: windows-latest
-    needs: ['setup'] #used to be coveralls
+    needs: ['setup']
     steps:
       - uses: actions/cache/restore@v3
         id: restore-build