Skip to content

Commit 193777b

Browse files
committed
coverage CI: fix VM-build expression parse error
GitHub Actions expressions only accept single-quoted strings, but the ctest invocation contains single quotes (the -E regex). Move the off-vs-coverage selection from a expression into a shell inside the script body.
1 parent 95bfb2b commit 193777b

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

.github/workflows/reusable-vm-build.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ jobs:
8080
cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -G Ninja ${{ inputs.cmake-flags }} ${{ inputs.coverage-mode != 'off' && '-DSNMALLOC_COVERAGE=ON' || '' }}
8181
cd ${{ github.workspace }}/build
8282
NINJA_STATUS="%p [%f:%s/%t] %o/s, %es" ninja
83-
${{ inputs.coverage-mode != 'off' && 'cmake --build . --target coverage' || "ctest -j 4 --output-on-failure -E '(perf-.*)|(.*-malloc$)' --timeout 400" }}
83+
if [ "${{ inputs.coverage-mode }}" != "off" ]; then
84+
cmake --build . --target coverage
85+
else
86+
ctest -j 4 --output-on-failure -E '(perf-.*)|(.*-malloc$)' --timeout 400
87+
fi
8488
8589
- name: Build on NetBSD
8690
if: inputs.vm-type == 'netbsd'
@@ -97,7 +101,11 @@ jobs:
97101
cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -G Ninja ${{ inputs.cmake-flags }} ${{ inputs.coverage-mode != 'off' && '-DSNMALLOC_COVERAGE=ON' || '' }}
98102
cd ${{ github.workspace }}/build
99103
NINJA_STATUS="%p [%f:%s/%t] %o/s, %es" ninja
100-
${{ inputs.coverage-mode != 'off' && 'cmake --build . --target coverage' || "ctest -j 4 --output-on-failure -E '(perf-.*)|(.*-malloc$)' --timeout 400" }}
104+
if [ "${{ inputs.coverage-mode }}" != "off" ]; then
105+
cmake --build . --target coverage
106+
else
107+
ctest -j 4 --output-on-failure -E '(perf-.*)|(.*-malloc$)' --timeout 400
108+
fi
101109
102110
- name: Build on OpenBSD
103111
if: inputs.vm-type == 'openbsd'
@@ -114,7 +122,11 @@ jobs:
114122
cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -G Ninja ${{ inputs.cmake-flags }} ${{ inputs.coverage-mode != 'off' && '-DSNMALLOC_COVERAGE=ON' || '' }}
115123
cd ${{ github.workspace }}/build
116124
NINJA_STATUS="%p [%f:%s/%t] %o/s, %es" ninja
117-
${{ inputs.coverage-mode != 'off' && 'cmake --build . --target coverage' || "ctest -j 4 --output-on-failure -E '(perf-.*)|(.*-malloc$)' --timeout 400" }}
125+
if [ "${{ inputs.coverage-mode }}" != "off" ]; then
126+
cmake --build . --target coverage
127+
else
128+
ctest -j 4 --output-on-failure -E '(perf-.*)|(.*-malloc$)' --timeout 400
129+
fi
118130
119131
- name: Upload coverage artifact
120132
if: inputs.coverage-mode != 'off'

0 commit comments

Comments
 (0)