Skip to content

Commit 918fccf

Browse files
committed
ci: move headerscheck, cpluspluscheck to meson
1 parent 43e96e8 commit 918fccf

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
@@ -1115,17 +1115,10 @@ task:
11151115
###
11161116
always:
11171117
headers_headerscheck_script: |
1118-
mkdir build-ac && cd build-ac
1119-
time ../configure \
1120-
${LINUX_CONFIGURE_FEATURES} \
1121-
--without-icu \
1122-
--quiet \
1123-
CC="gcc" CXX="g++" CLANG="clang"
1124-
make -s -j${BUILD_JOBS} world-bin
1125-
time make -s headerscheck EXTRAFLAGS='-fmax-errors=10'
1118+
CC=gcc meson setup build-headerscheck -Dicu=disabled
1119+
ninja -C build-headerscheck headerscheck
11261120
headers_cpluspluscheck_script: |
1127-
cd build-ac
1128-
time make -s cpluspluscheck EXTRAFLAGS='-fmax-errors=10'
1121+
ninja -C build-headerscheck cpluspluscheck
11291122
11301123
always:
11311124
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)