Reusable workflows' improvements

Author: alex-kulakov

.github/workflows/reusable-storage-dependant-tests.yml

@@ -16,7 +16,7 @@ on:
       target_framework:
         description: 'Target framework'
         required: true
-        default: 'net6.0'
+        default: 'netcoreapp2.0'
         type: string
       specific_sha:
         description: 'Commit SHA to checkout'
@@ -171,10 +171,9 @@ jobs:
 
       - name: Make Final Test report
         if: |
-          (github.event_name == 'push' && (steps.reprocessing.outcome != 'cancelled' && steps.complex_tests.outcome != 'cancelled'))
-            || (github.event_name == 'pull_request' && (steps.reprocessing.outcome != 'cancelled' && steps.complex_tests.outcome != 'cancelled'))
-            || (github.event_name == 'workflow_dispatch' && (steps.reprocessing.outcome != 'cancelled' && steps.complex_tests.outcome != 'cancelled'))
-            || (steps.reprocessing.outcome == 'failure' || steps.complex_tests.outcome == 'failure')
+          !cancelled() 
+            && ((github.event_name == 'push') || (github.event_name == 'pull_request') || (github.event_name == 'workflow_dispatch')
+              || (steps.reprocessing.outcome == 'failure' || steps.complex_tests.outcome == 'failure'))
         timeout-minutes: 1
         uses: dorny/test-reporter@v2.1.1
         with:

.github/workflows/reusable-storage-independant-tests.yml

@@ -11,7 +11,7 @@ on:
       target_framework:
         description: 'Target framework'
         required: true
-        default: 'net6.0'
+        default: 'netcoreapp2.0'
         type: string
       test_output_verbosity:
         description: 'Verbosity for dotnet test command'
@@ -122,10 +122,9 @@ jobs:
 
       - name: Make Final Test report
         if: |
-          (github.event_name == 'push' && steps.complex_tests.outcome != 'cancelled')
-            || (github.event_name == 'pull_request' &&  steps.complex_tests.outcome != 'cancelled')
-            || (github.event_name == 'workflow_dispatch' && steps.complex_tests.outcome != 'cancelled')
-            || steps.complex_tests.outcome == 'failure'
+          !cancelled() 
+            && ((github.event_name == 'push') || (github.event_name == 'pull_request') || (github.event_name == 'workflow_dispatch')
+              || (steps.reprocessing.outcome == 'failure' || steps.complex_tests.outcome == 'failure'))
         timeout-minutes: 1
         uses: dorny/test-reporter@v2.1.1
         with: