Consolidate DEB and RPM packages

CorruptComputer · Nov 13, 2024 · 51236fb · 51236fb
1 parent fb5f3cc
commit 51236fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/.github/workflows/publish-server.yml b/.github/workflows/publish-server.yml
@@ -43,22 +43,15 @@ jobs:
           dotnet rpm --configuration Release --version-suffix commit --output ../../publish/
           cd ../..
 
-      - name: Upload API DEB Build Artifact
+      - name: Upload DEB Build Artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: ./publish/Bones.Api.*.linux-x64.deb
+          name: 'Server DEB build.zip'
+          path: ./publish/*.linux-x64.deb
 
-      - name: Upload API RPM Build Artifact
+      - name: Upload RPM Build Artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: ./publish/Bones.Api.*.linux-x64.rpm
-
-      - name: Upload Background Service DEB Build Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          path: ./publish/Bones.BackgroundService.*.linux-x64.deb
-
-      - name: Upload Background Service RPM Build Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          path: ./publish/Bones.BackgroundService.*.linux-x64.rpm
+          name: 'Server RPM build.zip'
+          path: ./publish/*.linux-x64.rpm
+
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -58,7 +58,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
           dotnet tool install --global dotnet-sonarscanner
-          dotnet-sonarscanner begin /k:"CorruptComputer_Bones" /o:"corruptcomputer" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths=./Tests/*/*.UnitTests/TestResults/*/coverage.opencover.xml /d:sonar.scanner.scanAll=false /d:sonar.exclusions="**/Bones.Database/Migrations/**,**/AutoGen*.cs"
+          dotnet-sonarscanner begin /k:"CorruptComputer_Bones" /o:"corruptcomputer" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths=./Tests/*/*.UnitTests/TestResults/*/coverage.opencover.xml /d:sonar.scanner.scanAll=false /d:sonar.exclusions="**/Bones.Database/Migrations/**"
           dotnet build --configuration Debug --no-incremental
           dotnet test --no-build --collect:"XPlat Code Coverage;Format=opencover"
           dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"