ci: apply review comments on patch upload (#935)

hsutter · Jan 16, 2024 · 63dde3e · 63dde3e
1 parent 2e375b0
commit 63dde3e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  regression-tests-linux-mac:
+  regression-tests:
     name: Run on ${{ matrix.os }} using ${{ matrix.compiler }}
     runs-on: ${{ matrix.os }}
     env:
@@ -32,7 +32,6 @@ jobs:
       run: |
         cd regression-tests
         bash run-tests.sh -c ${{ matrix.compiler }}
-      continue-on-error: true
 
     - name: Run regression tests - Windows version
       if: matrix.os == 'windows-latest'
@@ -42,10 +41,11 @@ jobs:
         cd regression-tests && ^
         bash run-tests.sh -c ${{ matrix.compiler }}
       shell: cmd
-      continue-on-error: true
 
     - name: Upload patch
+      if: ${{ !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.compiler }}-patch.diff
         path: regression-tests/${{ matrix.compiler }}-patch.diff
+        if-no-files-found: ignore
diff --git a/regression-tests/run-tests.sh b/regression-tests/run-tests.sh
@@ -38,11 +38,11 @@ check_file () {
 
         failure=1
     else
-        # Compare the content with the refernece value checked in git
+        # Compare the content with the reference value checked in git
         diff_output=$(git diff --ignore-cr-at-eol -- "$file")
         if [[ -n "$diff_output" ]]; then
             echo "            Non-matching $description:"
-            printf "\n$diff_output\n\n"
+            printf "\n$diff_output\n\n" | tee -a "$cxx_compiler-patch.diff"
             failure=1
         fi
     fi
@@ -195,7 +195,7 @@ for test_file in $tests; do
         # The source is temporarily copied to avoid issues with bash paths in cl.exe
         (cd $exec_out_dir; \
          cp ../../$expected_src $generated_cpp_name;
-         $compiler_cmd "$test_bin" \
+         $compiler_cmd"$test_bin" \
                         $generated_cpp_name \
                         > $generated_cpp_name.output 2>&1)
         compilation_result=$?
@@ -252,7 +252,7 @@ for test_file in $tests; do
 done
 
 ################
-# Report missing reference data direcotry
+# Report missing reference data directory
 if [[ ! -d "$exec_out_dir" ]]; then
     echo "Reference data directory not found for compiler: '$cxx_compiler'"
     exit 3