Skip to content

Commit 39b3034

Browse files
committed
ci: move headerscheck, cpluspluscheck to meson
1 parent 5365be0 commit 39b3034

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

.cirrus.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -1127,17 +1127,10 @@ task:
11271127
###
11281128
always:
11291129
headers_headerscheck_script: |
1130-
mkdir build-ac && cd build-ac
1131-
time ../configure \
1132-
${LINUX_CONFIGURE_FEATURES} \
1133-
--without-icu \
1134-
--quiet \
1135-
CC="gcc" CXX="g++" CLANG="clang"
1136-
make -s -j${BUILD_JOBS} world-bin
1137-
time make -s headerscheck EXTRAFLAGS='-fmax-errors=10'
1130+
CC=gcc meson setup build-headerscheck -Dicu=disabled
1131+
ninja -C build-headerscheck headerscheck
11381132
headers_cpluspluscheck_script: |
1139-
cd build-ac
1140-
time make -s cpluspluscheck EXTRAFLAGS='-fmax-errors=10'
1133+
ninja -C build-headerscheck cpluspluscheck
11411134
11421135
always:
11431136
ccache_stats_end_script:

src/meson.build

+6-9
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,9 @@ generated_sources_stamp = custom_target('generated-sources-stamp.h',
5959
command: stamp_cmd,
6060
)
6161

62-
run_target('headerscheck',
63-
command: [files('tools/pginclude/headerscheck'), '@SOURCE_ROOT@', '@BUILD_ROOT@'],
64-
depends: [generated_sources_stamp, generated_headers_stamp, generated_backend_headers_stamp],
65-
)
66-
67-
run_target('cpluspluscheck',
68-
command: [files('tools/pginclude/cpluspluscheck'), '@SOURCE_ROOT@', '@BUILD_ROOT@'],
69-
depends: [generated_sources_stamp, generated_headers_stamp, generated_backend_headers_stamp],
70-
)
62+
foreach tgt : ['headerscheck', 'cpluspluscheck']
63+
run_target(tgt,
64+
command: [files('tools/pginclude/@0@'.format(tgt)), meson.source_root(), meson.build_root()],
65+
depends: [generated_sources_stamp, generated_headers_stamp, generated_backend_headers_stamp],
66+
)
67+
endforeach

0 commit comments

Comments
 (0)