Skip to content

Commit 43c2fc0

Browse files
committed
ci: move headerscheck, cpluspluscheck to meson
1 parent 47f127e commit 43c2fc0

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

.cirrus.tasks.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,17 +1070,10 @@ task:
10701070
###
10711071
always:
10721072
headers_headerscheck_script: |
1073-
mkdir build-ac && cd build-ac
1074-
time ../configure \
1075-
${LINUX_CONFIGURE_FEATURES} \
1076-
--without-icu \
1077-
--quiet \
1078-
CC="gcc" CXX="g++" CLANG="clang"
1079-
make -s -j${BUILD_JOBS} world-bin
1080-
time make -s headerscheck EXTRAFLAGS='-fmax-errors=10'
1073+
CC=gcc meson setup build-headerscheck -Dicu=disabled
1074+
ninja -C build-headerscheck headerscheck
10811075
headers_cpluspluscheck_script: |
1082-
cd build-ac
1083-
time make -s cpluspluscheck EXTRAFLAGS='-fmax-errors=10'
1076+
ninja -C build-headerscheck cpluspluscheck
10841077
10851078
always:
10861079
ccache_stats_end_script:

src/meson.build

Lines changed: 6 additions & 9 deletions
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)