Try to get coverage upload working

Author: dwoz

.github/workflows/test-action.yml

@@ -352,7 +352,7 @@ jobs:
           fi
 
       - name: Upload Code Coverage Test Run Artifacts
-        if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled'
+        if: ${{ !cancelled() && inputs.skip-code-coverage == false }}
         uses: actions/upload-artifact@v4
         with:
           name: testrun-coverage-artifacts-${{ matrix.slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ env.TIMESTAMP }}
@@ -664,7 +664,7 @@ jobs:
           fi
 
       - name: Upload Code Coverage Test Run Artifacts
-        if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled'
+        if: ${{ !cancelled() && inputs.skip-code-coverage == false }}
         uses: actions/upload-artifact@v4
         with:
           name: testrun-coverage-artifacts-${{ matrix.slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ env.TIMESTAMP }}
@@ -943,7 +943,7 @@ jobs:
           fi
 
       - name: Upload Code Coverage Test Run Artifacts
-        if: always() && inputs.skip-code-coverage == false &&  job.status != 'cancelled'
+        if: ${{ !cancelled() && inputs.skip-code-coverage == false }}
         uses: actions/upload-artifact@v4
         with:
           name: testrun-coverage-artifacts-${{ matrix.slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ matrix.test-group || 1 }}-${{ env.TIMESTAMP }}
@@ -1244,7 +1244,7 @@ jobs:
           fi
 
       - name: Upload Code Coverage Test Run Artifacts
-        if: always() && inputs.skip-code-coverage == false &&  job.status != 'cancelled'
+        if: ${{ !cancelled() && inputs.skip-code-coverage == false }}
         uses: actions/upload-artifact@v4
         with:
           name: testrun-coverage-artifacts-${{ matrix.slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ matrix.test-group || 1 }}-${{ env.TIMESTAMP }}
@@ -1351,35 +1351,35 @@ jobs:
         run: |
           python3 -m pip install 'nox==${{ inputs.nox-version }}'
 
-      - name: Create XML Coverage Reports
-        if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled'
-        run: |
-          nox --force-color -e create-xml-coverage-reports
-          mv artifacts/coverage/salt.xml artifacts/coverage/salt..${{ matrix.slug }}..${{ inputs.nox-session }}.xml
-          mv artifacts/coverage/tests.xml artifacts/coverage/tests..${{ matrix.slug }}..${{ inputs.nox-session }}.xml
-
-      - name: Report Salt Code Coverage
-        if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success'
-        continue-on-error: true
-        run: |
-          nox --force-color -e report-coverage -- salt
-
-      - name: Report Combined Code Coverage
-        if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success'
-        continue-on-error: true
-        run: |
-          nox --force-color -e report-coverage
-
-      - name: Rename Code Coverage DB
-        if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success'
-        continue-on-error: true
-        run: |
-          mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ matrix.slug }}.${{ inputs.nox-session }}
-
-      - name: Upload Code Coverage DB
-        if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled'
-        uses: actions/upload-artifact@v4
-        with:
-          name: all-testrun-coverage-artifacts-${{ matrix.slug }}.${{ inputs.nox-session }}
-          path: artifacts/coverage
-          include-hidden-files: true
+      # - name: Create XML Coverage Reports
+      #   if: !cancelled() && inputs.skip-code-coverage == false
+      #   run: |
+      #     nox --force-color -e create-xml-coverage-reports
+      #     mv artifacts/coverage/salt.xml artifacts/coverage/salt..${{ matrix.slug }}..${{ inputs.nox-session }}.xml
+      #     mv artifacts/coverage/tests.xml artifacts/coverage/tests..${{ matrix.slug }}..${{ inputs.nox-session }}.xml
+
+      # - name: Report Salt Code Coverage
+      #   if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success'
+      #   continue-on-error: true
+      #   run: |
+      #     nox --force-color -e report-coverage -- salt
+
+      # - name: Report Combined Code Coverage
+      #   if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success'
+      #   continue-on-error: true
+      #   run: |
+      #     nox --force-color -e report-coverage
+
+      # - name: Rename Code Coverage DB
+      #   if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success'
+      #   continue-on-error: true
+      #   run: |
+      #     mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ matrix.slug }}.${{ inputs.nox-session }}
+
+      # - name: Upload Code Coverage DB
+      #   if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled'
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: all-testrun-coverage-artifacts-${{ matrix.slug }}.${{ inputs.nox-session }}
+      #     path: artifacts/coverage
+      #     include-hidden-files: true