Skip to content

Commit 413c87e

Browse files
authored
small cleanup to make invocations in CI (#7804)
1 parent 376d7f1 commit 413c87e

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/CI-unixish-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ jobs:
116116
- name: Build test
117117
run: |
118118
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
119-
make -j$(nproc) testrunner HAVE_RULES=yes CXXOPTS="-w"
119+
make -j$(nproc) HAVE_RULES=yes CXXOPTS="-w" testrunner
120120
121121
- name: Run test
122122
run: |
123-
make -j$(nproc) check HAVE_RULES=yes
123+
make -j$(nproc) HAVE_RULES=yes check
124124
125125
# requires python3
126126
- name: Run extra tests

.github/workflows/CI-unixish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,11 @@ jobs:
417417
- name: Build test
418418
run: |
419419
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
420-
make -j$(nproc) testrunner HAVE_RULES=yes
420+
make -j$(nproc) HAVE_RULES=yes testrunner
421421
422422
- name: Run test
423423
run: |
424-
make -j$(nproc) check HAVE_RULES=yes
424+
make -j$(nproc) HAVE_RULES=yes check
425425
426426
# requires "gnu-sed" installed on macos
427427
- name: Run extra tests
@@ -609,7 +609,7 @@ jobs:
609609
run: |
610610
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
611611
# compile with verification and ast matchers
612-
make -j$(nproc) -s CXXOPTS="-g -O2 -w" CPPOPTS="-DCHECK_INTERNAL -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
612+
make -j$(nproc) CXXOPTS="-g -O2 -w" CPPOPTS="-DCHECK_INTERNAL -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
613613
614614
- name: CMake
615615
run: |

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Compile instrumented
4444
run: |
4545
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
46-
make -j$(nproc) all CXXOPTS="-g -fprofile-arcs -ftest-coverage" HAVE_RULES=yes
46+
make -j$(nproc) CXXOPTS="-g -fprofile-arcs -ftest-coverage" HAVE_RULES=yes all
4747
4848
- name: Run instrumented tests
4949
run: |

.github/workflows/scriptcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: build cppcheck
4040
run: |
4141
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
42-
make -j$(nproc) -s CXXOPTS="-w"
42+
make -j$(nproc) CXXOPTS="-w"
4343
strip -s ./cppcheck
4444
4545
scriptcheck:

.github/workflows/selfcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
5757
# valgrind cannot handle DWARF 5 yet so force version 4
5858
# work around performance regression with -inline-deferral
59-
make -j$(nproc) -s CXXOPTS="-O2 -w -gdwarf-4" CPPOPTS="-DHAVE_BOOST -mllvm -inline-deferral" MATCHCOMPILER=yes
59+
make -j$(nproc) CXXOPTS="-O2 -w -gdwarf-4" CPPOPTS="-DHAVE_BOOST -mllvm -inline-deferral" MATCHCOMPILER=yes
6060
env:
6161
CC: clang-14
6262
CXX: clang++-14

.github/workflows/valgrind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Build test
4747
run: |
4848
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
49-
CXXOPTS="-O1 -g -w" CPPOPTS="-DHAVE_BOOST" make -j$(nproc) testrunner HAVE_RULES=yes MATCHCOMPILER=yes
49+
make -j$(nproc) CXXOPTS="-O1 -g -w" CPPOPTS="-DHAVE_BOOST" HAVE_RULES=yes MATCHCOMPILER=yes testrunner
5050
5151
- name: Run valgrind
5252
run: |

0 commit comments

Comments
 (0)