Skip to content

Commit 63dde3e

Browse files
authored
ci: apply review comments on patch upload (#935)
1 parent 2e375b0 commit 63dde3e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/regression-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
workflow_dispatch:
88

99
jobs:
10-
regression-tests-linux-mac:
10+
regression-tests:
1111
name: Run on ${{ matrix.os }} using ${{ matrix.compiler }}
1212
runs-on: ${{ matrix.os }}
1313
env:
@@ -32,7 +32,6 @@ jobs:
3232
run: |
3333
cd regression-tests
3434
bash run-tests.sh -c ${{ matrix.compiler }}
35-
continue-on-error: true
3635
3736
- name: Run regression tests - Windows version
3837
if: matrix.os == 'windows-latest'
@@ -42,10 +41,11 @@ jobs:
4241
cd regression-tests && ^
4342
bash run-tests.sh -c ${{ matrix.compiler }}
4443
shell: cmd
45-
continue-on-error: true
4644

4745
- name: Upload patch
46+
if: ${{ !cancelled() }}
4847
uses: actions/upload-artifact@v4
4948
with:
5049
name: ${{ matrix.compiler }}-patch.diff
5150
path: regression-tests/${{ matrix.compiler }}-patch.diff
51+
if-no-files-found: ignore

regression-tests/run-tests.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ check_file () {
3838

3939
failure=1
4040
else
41-
# Compare the content with the refernece value checked in git
41+
# Compare the content with the reference value checked in git
4242
diff_output=$(git diff --ignore-cr-at-eol -- "$file")
4343
if [[ -n "$diff_output" ]]; then
4444
echo " Non-matching $description:"
45-
printf "\n$diff_output\n\n"
45+
printf "\n$diff_output\n\n" | tee -a "$cxx_compiler-patch.diff"
4646
failure=1
4747
fi
4848
fi
@@ -195,7 +195,7 @@ for test_file in $tests; do
195195
# The source is temporarily copied to avoid issues with bash paths in cl.exe
196196
(cd $exec_out_dir; \
197197
cp ../../$expected_src $generated_cpp_name;
198-
$compiler_cmd "$test_bin" \
198+
$compiler_cmd"$test_bin" \
199199
$generated_cpp_name \
200200
> $generated_cpp_name.output 2>&1)
201201
compilation_result=$?
@@ -252,7 +252,7 @@ for test_file in $tests; do
252252
done
253253

254254
################
255-
# Report missing reference data direcotry
255+
# Report missing reference data directory
256256
if [[ ! -d "$exec_out_dir" ]]; then
257257
echo "Reference data directory not found for compiler: '$cxx_compiler'"
258258
exit 3

0 commit comments

Comments
 (0)