From 28f811bb7fd5ce24b0bfa0f6a5cfa99f79e4ffb1 Mon Sep 17 00:00:00 2001 From: "Rodrigo Rodriguez (Pragmatismo)" Date: Fri, 10 Apr 2026 12:27:24 -0300 Subject: [PATCH] Update botserver workflow --- .forgejo/workflows/botserver.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/botserver.yaml b/.forgejo/workflows/botserver.yaml index 6c9ab349..870a15ba 100644 --- a/.forgejo/workflows/botserver.yaml +++ b/.forgejo/workflows/botserver.yaml @@ -29,22 +29,19 @@ jobs: mkdir -p $WORKSPACE cd $WORKSPACE - # Clone or update gb-ws (main workspace with Cargo.toml) - if [ -d gb-ws/.git ]; then - git -C gb-ws pull --ff-only origin main - else + # Clone gb-ws if it doesn't exist + if [ ! -d gb-ws/.git ]; then git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/gb.git gb-ws fi - # Initialize and update submodules (only botlib and botserver needed) + # Simple pull to get latest changes + git -C gb-ws pull origin main + + # Initialize submodules if needed cd gb-ws git submodule update --init --depth 1 botlib git submodule update --init --depth 1 botserver - # Pull latest updates from submodules (fetch and reset to handle divergent histories) - git -C botlib fetch origin main && git -C botlib reset --hard origin/main - git -C botserver fetch origin main && git -C botserver reset --hard origin/main - mkdir -p /home/gbuser/target - name: Cache sccache