From 9c29e367d650ead2d47af7bad60258e3c5c0b552 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Tue, 7 Jul 2026 21:46:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E7=A1=AC=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E8=B7=AF=E5=BE=84=EF=BC=8C=E5=85=A8=E9=83=A8=E4=BB=8E?= =?UTF-8?q?git=E4=BB=93=E5=BA=93=E5=85=8B=E9=9A=86=20=E2=80=94=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dconfig.json=20DB=E5=87=AD=E8=AF=81=E5=92=8C=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=EF=BC=8Cbuild.sh=E5=85=8B=E9=9A=86pipeline-sdlc/showc?= =?UTF-8?q?ase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 27 +++++++++++++++++++++------ conf/config.json | 12 ++++++------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/build.sh b/build.sh index 9566845..15c595d 100644 --- a/build.sh +++ b/build.sh @@ -37,8 +37,22 @@ if [ -d bricks/bricks ]; then fi cd "$cdir" -# 4. Install business modules -for mod in pipeline_core pipeline_ops pipeline_dist; do +# 4. Clone pipeline-sdlc and showcase +for m in pipeline-sdlc showcase; do + echo "clone $m ..." + cd "$cdir/pkgs" + if [ ! -d "$m" ]; then + git clone https://git.opencomputing.cn/yumoqing/$m || echo "SKIP: $m clone failed" + fi + # pipeline-sdlc goes to root (same as other business modules) + if [ "$m" = "pipeline-sdlc" ] && [ ! -d "$cdir/pipeline-sdlc" ]; then + ln -sf "$cdir/pkgs/pipeline-sdlc" "$cdir/pipeline-sdlc" + fi + cd "$cdir" +done + +# 5. Install business modules +for mod in pipeline_core pipeline_ops pipeline_dist pipeline-sdlc; do echo "install $mod ..." cd "$cdir/$mod" "$cdir/py3/bin/pip" install . 2>&1 | tail -1 @@ -59,14 +73,15 @@ for mod in pipeline_core pipeline_ops pipeline_dist; do cd "$cdir" done -# 4b. Install showcase module (symlinked from repos) -if [ -d "$cdir/showcase" ] || [ -L "$cdir/showcase" ]; then +# 5b. Install showcase module +if [ -d "$cdir/pkgs/showcase" ]; then echo "install showcase ..." + cd "$cdir/pkgs/showcase" + "$cdir/py3/bin/pip" install . 2>&1 | tail -1 cd "$cdir" - "$cdir/py3/bin/pip" install -e /home/hermesai/repos/showcase 2>&1 | tail -1 fi -# 5. Create runtime dirs +# 6. Create runtime dirs mkdir -p "$cdir/logs" "$cdir/files" chmod +x "$cdir/start.sh" "$cdir/stop.sh" diff --git a/conf/config.json b/conf/config.json index 7741663..49bcd81 100644 --- a/conf/config.json +++ b/conf/config.json @@ -12,9 +12,9 @@ "kwargs": { "host": "127.0.0.1", "port": 3306, - "user": "hermes", - "password": "hTk87ujLrxZeoMcD2Rlwbg==", - "db": "pipeline", + "user": "test", + "password": "QUZVcXg5V1p1STMybG5Ia0cn3HIUaqU=", + "db": "sage", "charset": "utf8mb4" } }, @@ -23,8 +23,8 @@ "kwargs": { "host": "127.0.0.1", "port": 3306, - "user": "hermes", - "password": "hTk87ujLrxZeoMcD2Rlwbg==", + "user": "test", + "password": "QUZVcXg5V1p1STMybG5Ia0cn3HIUaqU=", "db": "sage", "charset": "utf8mb4" } @@ -50,7 +50,7 @@ "/appbase" ], [ - "/home/hermesai/repos/pipeline-sdlc/wwwroot", + "$[workdir]$/pkgs/pipeline-sdlc/wwwroot", "/pipeline_sdlc" ] ],