diff --git a/.forgejo/workflows/botapp.yaml b/.forgejo/workflows/botapp.yaml deleted file mode 100644 index 1116194b..00000000 --- a/.forgejo/workflows/botapp.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Botapp CI -on: - push: - branches: [main] - paths: - - 'botapp/**' -jobs: - build: - runs-on: gbo - steps: - - name: Build - run: | - cd /opt/gbo/work/botapp - git reset --hard HEAD && git clean -fd - git pull - cargo build diff --git a/.forgejo/workflows/botbook.yaml b/.forgejo/workflows/botbook.yaml deleted file mode 100644 index cddfea47..00000000 --- a/.forgejo/workflows/botbook.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Botbook CI -on: - push: - branches: [main] - paths: - - 'botbook/**' -jobs: - build: - runs-on: gbo - steps: - - name: Build - run: | - cd /opt/gbo/work/botbook - git reset --hard HEAD && git clean -fd - git pull - cargo build diff --git a/.forgejo/workflows/botdevice.yaml b/.forgejo/workflows/botdevice.yaml deleted file mode 100644 index 41e54185..00000000 --- a/.forgejo/workflows/botdevice.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Botdevice CI -on: - push: - branches: [main] - paths: - - 'botdevice/**' -jobs: - build: - runs-on: gbo - steps: - - name: Build - run: | - cd /opt/gbo/work/botdevice - git reset --hard HEAD && git clean -fd - git pull - cargo build diff --git a/.forgejo/workflows/botlib.yaml b/.forgejo/workflows/botlib.yaml new file mode 100644 index 00000000..0c962b21 --- /dev/null +++ b/.forgejo/workflows/botlib.yaml @@ -0,0 +1,26 @@ +name: Botlib CI +on: + push: + branches: [main] + paths: + - 'botlib/**' + - '.forgejo/workflows/botlib.yaml' +env: + SCCACHE_DIR: /opt/gbo/work/.sccache + CARGO_TARGET_DIR: /opt/gbo/work/target + RUSTC_WRAPPER: sccache + PATH: /home/gbuser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +jobs: + build: + runs-on: gbo + steps: + - name: Setup + run: | + cd /opt/gbo/work/generalbots + git reset --hard HEAD + git clean -fd + git pull + - name: Test + run: | + cd /opt/gbo/work/generalbots + cargo test -p botlib diff --git a/.forgejo/workflows/botmodels.yaml b/.forgejo/workflows/botmodels.yaml deleted file mode 100644 index 7e0dc5a5..00000000 --- a/.forgejo/workflows/botmodels.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Botmodels CI -on: - push: - branches: [main] - paths: - - 'botmodels/**' -jobs: - build: - runs-on: gbo - steps: - - name: Build - run: | - cd /opt/gbo/work/botmodels - git reset --hard HEAD && git clean -fd - git pull - cargo build diff --git a/.forgejo/workflows/botplugin.yaml b/.forgejo/workflows/botplugin.yaml deleted file mode 100644 index d1e2dc36..00000000 --- a/.forgejo/workflows/botplugin.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Botplugin CI -on: - push: - branches: [main] - paths: - - 'botplugin/**' -jobs: - build: - runs-on: gbo - steps: - - name: Build - run: | - cd /opt/gbo/work/botplugin - git reset --hard HEAD && git clean -fd - git pull - cargo build diff --git a/.forgejo/workflows/botserver.yaml b/.forgejo/workflows/botserver.yaml index 199b4314..c39ebc7d 100644 --- a/.forgejo/workflows/botserver.yaml +++ b/.forgejo/workflows/botserver.yaml @@ -3,10 +3,10 @@ on: push: branches: [main] paths: - - 'botserver/**' - - 'botlib/**' - - 'Cargo.lock' - - '.forgejo/workflows/botserver.yaml' + - 'botserver/**' + - 'botlib/**' + - 'Cargo.lock' + - '.forgejo/workflows/botserver.yaml' env: SCCACHE_DIR: /opt/gbo/work/.sccache CARGO_TARGET_DIR: /opt/gbo/work/target @@ -16,22 +16,22 @@ jobs: build: runs-on: gbo steps: - - name: Setup - run: | - cd /opt/gbo/work/generalbots - git reset --hard HEAD - git clean -fd - git pull - - name: Build - run: | - cd /opt/gbo/work/generalbots - cargo build -p botserver - - name: Deploy - run: | - timeout 5 bash -c 'while pgrep -x botserver > /dev/null; do pkill -x botserver; sleep 0.5; done' || true - mkdir -p /opt/gbo/bin - cp -f /opt/gbo/work/generalbots/target/debug/botserver /opt/gbo/bin/ - chmod +x /opt/gbo/bin/botserver - cd /opt/gbo/bin && ./botserver --noconsole & - sleep 3 - pgrep -x botserver && echo "✅ BotServer Deployed" || echo "❌ Failed" + - name: Setup + run: | + cd /opt/gbo/work/generalbots + git reset --hard HEAD + git clean -fd + git pull + - name: Build + run: | + cd /opt/gbo/work/generalbots + cargo build -p botserver --bin botserver + - name: Deploy + run: | + timeout 5 bash -c 'while pgrep -x botserver > /dev/null; do pkill -x botserver; sleep 0.5; done' || true + mkdir -p /opt/gbo/bin + cp -f /opt/gbo/work/generalbots/target/debug/botserver /opt/gbo/bin/ + chmod +x /opt/gbo/bin/botserver + cd /opt/gbo/bin && RUST_LOG=info nohup ./botserver --noconsole > /opt/gbo/logs/stdout.log 2> /opt/gbo/logs/stderr.log & + sleep 5 + pgrep -x botserver && echo "BotServer Deployed" || echo "Failed" diff --git a/.forgejo/workflows/bottest.yaml b/.forgejo/workflows/bottest.yaml index c172dfc3..f4f10eab 100644 --- a/.forgejo/workflows/bottest.yaml +++ b/.forgejo/workflows/bottest.yaml @@ -4,13 +4,24 @@ on: branches: [main] paths: - 'bottest/**' + - 'botlib/**' + - '.forgejo/workflows/bottest.yaml' +env: + SCCACHE_DIR: /opt/gbo/work/.sccache + CARGO_TARGET_DIR: /opt/gbo/work/target + RUSTC_WRAPPER: sccache + PATH: /home/gbuser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin jobs: build: runs-on: gbo steps: - - name: Build - run: | - cd /opt/gbo/work/bottest - git reset --hard HEAD && git clean -fd - git pull - cargo build + - name: Setup + run: | + cd /opt/gbo/work/generalbots + git reset --hard HEAD + git clean -fd + git pull + - name: Test + run: | + cd /opt/gbo/work/generalbots + cargo test -p bottest diff --git a/.forgejo/workflows/botui.yaml b/.forgejo/workflows/botui.yaml index c85c33e7..a901e4c4 100644 --- a/.forgejo/workflows/botui.yaml +++ b/.forgejo/workflows/botui.yaml @@ -5,16 +5,32 @@ on: paths: - 'botui/**' - 'botlib/**' + - '.forgejo/workflows/botui.yaml' +env: + SCCACHE_DIR: /opt/gbo/work/.sccache + CARGO_TARGET_DIR: /opt/gbo/work/target + RUSTC_WRAPPER: sccache + PATH: /home/gbuser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin jobs: build: runs-on: gbo steps: - - name: Build - run: | - cd /opt/gbo/work/botui - git reset --hard HEAD && git clean -fd - git pull - cargo build - - name: Deploy - run: | - echo "BotUI deployed" + - name: Setup + run: | + cd /opt/gbo/work/generalbots + git reset --hard HEAD + git clean -fd + git pull + - name: Build + run: | + cd /opt/gbo/work/generalbots + cargo build -p botui --bin botui + - name: Deploy + run: | + timeout 5 bash -c 'while pgrep -x botui > /dev/null; do pkill -x botui; sleep 0.5; done' || true + mkdir -p /opt/gbo/bin + cp -f /opt/gbo/work/generalbots/target/debug/botui /opt/gbo/bin/ + chmod +x /opt/gbo/bin/botui + cd /opt/gbo/bin && RUST_LOG=info nohup ./botui --noconsole >> /opt/gbo/logs/stdout.log 2>> /opt/gbo/logs/stderr.log & + sleep 3 + pgrep -x botui && echo "BotUI Deployed" || echo "Failed"