GeneralBots/generalbots
1
0
Fork 0
Code Activity Actions 5

Fix CI: Use git reset to preserve timestamps for incremental builds
Some checks failed
BotServer CI/CD / build (push) Failing after 10m1s
Details

Browse source
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-04-17 17:43:04 -03:00
parent 4561d2d4fb
commit ceac526bc5
1 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
.forgejo/workflows/botserver.yaml
View file

@ -34,18 +34,44 @@ jobs:
mkdir -p /tmp/cargo mkdir -p /tmp/cargo
mkdir -p /tmp/persistent-botserver mkdir -p /tmp/persistent-botserver
mkdir -p /tmp/gb-ws mkdir -p /tmp/gb-ws
chown -R gbuser:gbuser /tmp/persistent-botserver
- name: Clone Repositories (Fresh) - name: Update botlib
run: | run: |
set -e
cd /tmp/persistent-botserver cd /tmp/persistent-botserver
rm -rf botlib botserver Cargo.toml if [ -d botlib/.git ]; then
git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/botlib.git botlib cd botlib && git fetch origin main && git reset --hard origin/main
git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/BotServer.git botserver else
if [ -d /tmp/gb-ws/.git ]; then rm -rf botlib
rm -rf /tmp/gb-ws git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/botlib.git botlib
fi fi
git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/gb.git /tmp/gb-ws
- name: Update botserver
run: |
cd /tmp/persistent-botserver
if [ -d botserver/.git ]; then
cd botserver
git config user.email "ci@pragmatismo.com.br"
git config user.name "CI Runner"
git fetch origin main
git reset --hard origin/main
else
rm -rf botserver
git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/BotServer.git botserver
fi
- name: Update gb workspace
run: |
if [ -d /tmp/gb-ws/.git ]; then
cd /tmp/gb-ws && git fetch origin main && git reset --hard origin/main
else
rm -rf /tmp/gb-ws
git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/gb.git /tmp/gb-ws
fi
- name: Setup Cargo.toml
run: |
cd /tmp/persistent-botserver
cp /tmp/gb-ws/Cargo.toml Cargo.toml cp /tmp/gb-ws/Cargo.toml Cargo.toml
for m in botapp botdevice bottest botui botbook botmodels botplugin bottemplates; do for m in botapp botdevice bottest botui botbook botmodels botplugin bottemplates; do
grep -v "\"$m\"" Cargo.toml > /tmp/c.toml && mv /tmp/c.toml Cargo.toml grep -v "\"$m\"" Cargo.toml > /tmp/c.toml && mv /tmp/c.toml Cargo.toml
@ -56,37 +82,36 @@ jobs:
run: | run: |
export PATH="/home/gbuser/.cargo/bin:/home/gbuser/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin:$PATH" export PATH="/home/gbuser/.cargo/bin:/home/gbuser/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin:$PATH"
sccache --start-server 2>/dev/null || true sccache --start-server 2>/dev/null || true
echo "Building BotServer with cached target..."
cargo build --package botserver 2>&1 | tee /tmp/build.log cargo build --package botserver 2>&1 | tee /tmp/build.log
sccache --stop-server 2>/dev/null || true sccache --stop-server 2>/dev/null || true
- name: Deploy - name: Deploy
run: | run: |
set -e set -e
SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o ConnectTimeout=5" SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no"
echo "Stopping botserver..." echo "Stopping botserver..."
ssh $SSH_ARGS system "sudo systemctl stop botserver 2>/dev/null || true; sleep 2" ssh $SSH_ARGS system "sudo systemctl stop botserver 2>/dev/null || true; sleep 2"
echo "Transferring new binary..." echo "Transferring binary..."
scp $SSH_ARGS /tmp/persistent-botserver/target/debug/botserver system:/tmp/botserver-new scp $SSH_ARGS /tmp/persistent-botserver/target/debug/botserver system:/tmp/botserver-new
ssh $SSH_ARGS system "sudo mv /tmp/botserver-new /opt/gbo/bin/botserver && sudo chmod +x /opt/gbo/bin/botserver && sudo chown gbuser:gbuser /opt/gbo/bin/botserver" ssh $SSH_ARGS system "sudo mv /tmp/botserver-new /opt/gbo/bin/botserver && sudo chmod +x /opt/gbo/bin/botserver && sudo chown gbuser:gbuser /opt/gbo/bin/botserver"
echo "Starting botserver..." echo "Starting..."
ssh $SSH_ARGS system "sudo systemctl start botserver" ssh $SSH_ARGS system "sudo systemctl start botserver"
echo "Health check..." echo "Health check..."
sleep 5 sleep 5
for i in $(seq 1 30); do for i in $(seq 1 30); do
if ssh $SSH_ARGS system "curl -sf http://localhost:8080/api/health" 2>/dev/null; then if ssh $SSH_ARGS system "curl -sf http://localhost:8080/api/health" 2>/dev/null; then
echo "Health check passed!" echo "OK"
break break
fi fi
echo "waiting ($i/30)..." echo "wait ($i/30)"
sleep 2 sleep 2
done done
- name: Verify - name: Verify
run: | run: |
SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no" SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no"
ssh $SSH_ARGS system "pgrep -f botserver && echo 'OK: botserver running' || echo 'FAIL'" ssh $SSH_ARGS system "pgrep -f botserver && echo OK || echo FAIL"