From 90d892349a387b718f03ded506571776236823b3 Mon Sep 17 00:00:00 2001 From: zjk <1553836110@qq.com> Date: Fri, 14 Aug 2026 22:56:10 +0800 Subject: [PATCH] =?UTF-8?q?CI=EF=BC=9A=E9=99=8D=E4=BD=8E=20QEMU=20?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=B9=B6=E8=A1=8C=E5=BA=A6(-j2)=20=E7=BC=93?= =?UTF-8?q?=E8=A7=A3=E5=86=85=E5=AD=98=E5=8E=8B=E5=8A=9B=EF=BC=8C=E5=86=92?= =?UTF-8?q?=E7=83=9F=E9=98=B6=E6=AE=B5=E5=8A=A0=E5=86=85=E5=AD=98=E8=AF=8A?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/Dockerfile | 6 +++--- ci/build-test.sh | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 57c8e72..53a5504 100755 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -48,9 +48,9 @@ RUN --mount=type=secret,id=gitea_token \ #----------------------------------------------------------------------- WORKDIR /opt/moos-ivp -RUN ./build-moos.sh -m -j"$(nproc)" && \ +RUN ./build-moos.sh -m -j2 && \ make -C build/MOOS/MOOSCore install && \ - ./build-ivp.sh -n -j"$(nproc)" && \ + ./build-ivp.sh -n -j2 && \ make -C build/ivp install && \ ldconfig @@ -75,7 +75,7 @@ RUN --mount=type=secret,id=gitea_token \ git clone --depth 1 "https://zjk:${TOKEN}@gitea2.zhaojingkui.xyz/zjk/googletest.git" /opt/googletest; \ mkdir -p /opt/googletest/build && cd /opt/googletest/build && \ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_GMOCK=ON .. && \ - make -j"$(nproc)" && \ + make -j2 && \ make install && \ ldconfig diff --git a/ci/build-test.sh b/ci/build-test.sh index be79288..bc3b79a 100755 --- a/ci/build-test.sh +++ b/ci/build-test.sh @@ -40,7 +40,7 @@ mkdir -p build cd build t0=$(now_ms) if cmake -DCMAKE_BUILD_TYPE=Release .. > /tmp/cmake.log 2>&1 \ - && make -j"$(nproc)" > /tmp/make.log 2>&1; then + && make -j2 > /tmp/make.log 2>&1; then BUILD_OK=1 else echo "--- build failed ---" >&2 @@ -92,6 +92,8 @@ fi #----------------------------------------------------------------------- if [ "${BUILD_OK}" = "1" ]; then echo ">>> Smoke test: launch MOOSDB + pPowerManger" + echo ">>> [mem-diagnostic] nproc=$(nproc), ulimit -v=$(ulimit -v), free:" + free -m 2>/dev/null | head -3 || true MOOSDB="$(command -v MOOSDB || true)" if [ -z "${MOOSDB}" ]; then