test

Author: IVNSTN

.github/workflows/ci.yml

@@ -125,46 +125,7 @@ jobs:
         name: NUnit testing ${{ matrix.configuration }} build on ${{ matrix.os }}
         path: '**/TestResults/*.trx,*.trx'
         reporter: dotnet-trx
-    
-    - name: Grab TSQL plugin for 3.1
-      uses: dawidd6/action-download-artifact@v11
-      if: ${{ matrix.configuration == 'Release' && matrix.os == 'windows-latest' && steps.build.conclusion == 'success' }}
-      with:
-        github_token: ${{secrets.GITHUB_TOKEN}}
-        repo: IVNSTN/TeamTools.Linter.TSQL
-        workflow: ci.yml
-        workflow_conclusion: completed
-        branch: main
-        name: TeamTools\.Linter\.TSQL-[\d.]+-Release-netstandard2\.0
-        name_is_regexp: true
-        path: ${{ env.OUTPUT_PATH }}/${{ matrix.configuration }}/netcoreapp3.1/Plugins
-    
-    - name: Grab TSQL plugin for 6.0
-      uses: dawidd6/action-download-artifact@v11
-      if: ${{ matrix.configuration == 'Release' && matrix.os == 'windows-latest' && steps.build.conclusion == 'success' }}
-      with:
-        github_token: ${{secrets.GITHUB_TOKEN}}
-        repo: IVNSTN/TeamTools.Linter.TSQL
-        workflow: ci.yml
-        workflow_conclusion: completed
-        branch: main
-        name: TeamTools\.Linter\.TSQL-[\d.]+-Release-net6\.0
-        name_is_regexp: true
-        path: ${{ env.OUTPUT_PATH }}/${{ matrix.configuration }}/net6.0/Plugins
 
-    - name: Grab TSQL plugin for 8.0
-      uses: dawidd6/action-download-artifact@v11
-      if: ${{ matrix.configuration == 'Release' && matrix.os == 'windows-latest' && steps.build.conclusion == 'success' }}
-      with:
-        github_token: ${{secrets.GITHUB_TOKEN}}
-        repo: IVNSTN/TeamTools.Linter.TSQL
-        workflow: ci.yml
-        workflow_conclusion: completed
-        branch: main
-        name: TeamTools\.Linter\.TSQL-[\d.]+-Release-net8\.0
-        name_is_regexp: true
-        path: ${{ env.OUTPUT_PATH }}/${{ matrix.configuration }}/net8.0/Plugins
-        
     - name: Upload build artifacts 3.1
       uses: actions/upload-artifact@v4
       if: ${{ matrix.configuration == 'Release' && matrix.os == 'windows-latest' && steps.build.conclusion == 'success' }}
@@ -228,3 +189,69 @@ jobs:
     - name: Print code coverage
       if: steps.create_coverage_badge.outcome == 'success'
       run: echo "Code coverage percentage ${{steps.create_coverage_badge.outputs.percentage}}%"
+
+  repack-with-plugins:
+    name: Repackage with plugins
+    if: always()
+    needs: [build, semver]
+    runs-on: ubuntu-latest
+    
+    defaults:
+      run:
+        shell: bash
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # plugin: [TeamTools.Linter.TSQL, TeamTools.Linter.SSDT]
+        dotnet: [netstandard2.0, net6.0, net8.0]
+        include:
+          - dotnet: net6.0
+            app-dotnet: net6.0
+          - dotnet: net8.0
+            app-dotnet: net8.0
+          - dotnet: netstandard2.0
+            app-dotnet: netcoreapp3.1
+
+    - name: Grab CLI ${{ matrix.app-dotnet }}
+      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: Grab TSQL plugin ${{ matrix.dotnet }}
+      uses: dawidd6/action-download-artifact@v11
+      with:
+        github_token: ${{secrets.GITHUB_TOKEN}}
+        repo: IVNSTN/TeamTools.Linter.TSQL
+        workflow: ci.yml
+        workflow_conclusion: completed
+        branch: main
+        name: TeamTools\.Linter\.TSQL-[\d.]+-Release-netstandard2\.0
+        name_is_regexp: true
+        path: ${{ steps.cli.outputs.download-path }}/Plugins
+
+    - name: Grab SSDT plugin for ${{ matrix.dotnet }}
+      uses: dawidd6/action-download-artifact@v11
+      with:
+        github_token: ${{secrets.GITHUB_TOKEN}}
+        repo: IVNSTN/TeamTools.Linter.SSDT
+        workflow: ci.yml
+        workflow_conclusion: completed
+        branch: main
+        name: TeamTools\.Linter\.TSQL-[\d.]+-Release-netstandard2\.0
+        name_is_regexp: true
+        path: ${{ steps.cli.outputs.download-path }}/Plugins
+
+    - name: Remove version info from plugin folder names
+      run: >
+        cd "${{ steps.cli.outputs.download-path }}/Plugins" 
+        find . -name "TeamTools.Linter.TSQL*" -type d | mv TeamTools.Linter.SSDT
+        find . -name "TeamTools.Linter.SSDT*" -type d | mv TeamTools.Linter.TSQL
+
+    - name: Upload repack
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-Release-net8.0-plugins-TSQL-SSDT
+        path: ${{ steps.cli.outputs.download-path }}