Update ci.yml

Author: IVNSTN

.github/workflows/ci.yml

@@ -61,6 +61,7 @@ jobs:
           3.1.x
           6.0.x
           8.0.x
+        cache: true
 
     - name: Display dotnet version
       run: dotnet --info
@@ -97,6 +98,13 @@ jobs:
         -p:RepositoryBranch="${{ github.ref_name }}"
         -p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
 
+    - name: Upload release bundle
+      uses: actions/upload-artifact@v4
+      if: ${{ matrix.configuration == 'Release' && matrix.os == 'windows-latest' && steps.build.conclusion == 'success' }}
+      with:
+        name: bundle-${{ matrix.configuration }}
+        path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}
+
     - name: Test
       if: ${{ !matrix.coverage }}
       run: >
@@ -120,33 +128,6 @@ jobs:
       with:
         name: test-results
         path: TestResults
-
-    - name: Prepare package
-      if: ${{ matrix.configuration == 'Release' }}
-      run: >
-        dotnet publish "${{ env.PUBLISH_PROJECT_PATH }}" --no-build
-        -p:TargetFramework=netcoreapp3.1
-        -p:Configuration=${{ matrix.configuration }}
-        -p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
-        -p:PublishDir="${{ env.PUBLISH_PATH }}/Release/netcoreapp3.1"
-        &&
-        dotnet publish "${{ env.PUBLISH_PROJECT_PATH }}" --no-build
-        -p:TargetFramework=net6.0
-        -p:Configuration=${{ matrix.configuration }}
-        -p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
-        -p:PublishDir="${{ env.PUBLISH_PATH }}/Release/net6.0"
-        &&
-        dotnet publish "${{ env.PUBLISH_PROJECT_PATH }}" --no-build
-        -p:TargetFramework=net8.0
-        -p:Configuration=${{ matrix.configuration }}
-        -p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
-        -p:PublishDir="${{ env.PUBLISH_PATH }}/Release/net8.0"
-
-    - name: list
-      if: ${{ matrix.configuration == 'Release' }}
-      run: |
-        cd "${{ env.PUBLISH_PATH }}"
-        ls -R
 
     - name: Test Report
       uses: dorny/test-reporter@v2
@@ -156,27 +137,6 @@ jobs:
         path: '**/TestResults/*.trx,*.trx'
         reporter: dotnet-trx
 
-    - name: Upload build artifacts 3.1
-      uses: actions/upload-artifact@v4
-      if: ${{ matrix.configuration == 'Release' && matrix.os == 'windows-latest' && steps.build.conclusion == 'success' }}
-      with:
-        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-netcoreapp3.1
-        path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/netcoreapp3.1
-
-    - name: Upload build artifacts 6.0
-      uses: actions/upload-artifact@v4
-      if: ${{ matrix.configuration == 'Release' && matrix.os == 'windows-latest' && steps.build.conclusion == 'success' }}
-      with:
-        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net6.0
-        path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net6.0
-
-    - name: Upload build artifacts 8.0
-      uses: actions/upload-artifact@v4
-      if: ${{ matrix.configuration == 'Release' && matrix.os == 'windows-latest' && steps.build.conclusion == 'success' }}
-      with:
-        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net8.0
-        path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net8.0
-
   report:
     needs: build
     if: always()
@@ -220,20 +180,52 @@ jobs:
       if: steps.create_coverage_badge.outcome == 'success'
       run: echo "Code coverage percentage ${{steps.create_coverage_badge.outputs.percentage}}%"
 
+  repack-per-framework:
+    name: Repackage per framework
+    if: always()
+    needs: [build, semver]
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        app-dotnet: [netcoreapp3.1, net6.0, net8.0]
+        configuration: [Release]
+
+    steps:
+    - name: Grab bundle
+      id: cli
+      uses: actions/download-artifact@v4
+      with:
+        name: bundle-${{ matrix.configuration }}
+        path: ${{ env.OUTPUT_PATH }}
+
+    - name: Prepare publish package for 
+      if: ${{ matrix.configuration == 'Release' }}
+      run: >
+        dotnet publish "${{ env.PUBLISH_PROJECT_PATH }}" --no-build
+        -p:TargetFramework=${{ matrix.app-dotnet }}
+        -p:Configuration=${{ matrix.configuration }}
+        -p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
+        -p:PublishDir="${{ env.PUBLISH_PATH }}/Release/${{ matrix.app-dotnet }}"
+
+    - name: Upload build for ${{ matrix.app-dotnet }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-${{ matrix.app-dotnet }}
+        path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/${{ matrix.app-dotnet }}
+  
   repack-with-plugins:
     name: Repackage with plugins
     if: always()
-    needs: [build, semver]
+    needs: [build, semver, repack-per-framework]
     runs-on: ubuntu-latest
-    
-    defaults:
-      run:
-        shell: bash
 
     strategy:
       fail-fast: false
       matrix:
         # plugin: [TeamTools.Linter.TSQL, TeamTools.Linter.SSDT]
+        configuration: [Release]
         dotnet: [netstandard2.0, net6.0, net8.0]
         include:
           - dotnet: net6.0
@@ -248,8 +240,8 @@ jobs:
       id: cli
       uses: actions/download-artifact@v4
       with:
-        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-Release-${{ matrix.app-dotnet }}
-        path: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-Release-${{ matrix.app-dotnet }}
+        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-${{ matrix.app-dotnet }}
+        path: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-${{ matrix.app-dotnet }}
 
     - name: Grab TSQL plugin ${{ matrix.dotnet }}
       uses: dawidd6/action-download-artifact@v11
@@ -259,7 +251,7 @@ jobs:
         workflow: ci.yml
         workflow_conclusion: completed
         branch: main
-        name: TeamTools\.Linter\.TSQL-[\d.]+-Release-${{ matrix.dotnet }}
+        name: TeamTools\.Linter\.TSQL-[\d.]+-${{ matrix.configuration }}-${{ matrix.dotnet }}
         name_is_regexp: true
         path: ${{ steps.cli.outputs.download-path }}/Plugins
 
@@ -271,7 +263,7 @@ jobs:
         workflow: ci.yml
         workflow_conclusion: completed
         branch: main
-        name: TeamTools\.Linter\.SSDT-[\d.]+-Release-${{ matrix.dotnet }}
+        name: TeamTools\.Linter\.SSDT-[\d.]+-${{ matrix.configuration }}-${{ matrix.dotnet }}
         name_is_regexp: true
         path: ${{ steps.cli.outputs.download-path }}/Plugins
 
@@ -285,15 +277,8 @@ jobs:
           mv "${dir}" "TeamTools.Linter.SSDT";
         done
 
-    - name: Remove dev config
-      if: ${{ matrix.app-dotnet == 'netcoreapp3.1' }}
-      run: |
-        cd "${{ steps.cli.outputs.download-path }}"
-        ls *.json
-        rm -f TeamTools.Linter.CommandLine.runtimeconfig.dev.json
-
     - name: Upload repack
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-Release-${{ matrix.app-dotnet }}-with-plugins-TSQL-SSDT
+        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-${{ matrix.app-dotnet }}-with-plugins-TSQL-SSDT
         path: ${{ steps.cli.outputs.download-path }}