From 464d9f88ba50b8ac000dea392f09fd44a89f0805 Mon Sep 17 00:00:00 2001 From: "Rodrigo Rodriguez (Pragmatismo)" Date: Fri, 10 Apr 2026 15:19:29 -0300 Subject: [PATCH] Fix CI: force submodule update to match parent repo --- .forgejo/workflows/botserver.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/botserver.yaml b/.forgejo/workflows/botserver.yaml index 948ddb89..5de3683d 100644 --- a/.forgejo/workflows/botserver.yaml +++ b/.forgejo/workflows/botserver.yaml @@ -37,11 +37,15 @@ jobs: # Simple pull to get latest changes git -C gb-ws pull origin main - # Initialize all workspace member submodules - cd gb-ws - git submodule update --init --depth 1 botlib botserver botapp botdevice bottest botui + # Initialize/update all workspace member submodules + cd gb-ws + git submodule sync + git submodule update --init --depth 1 botlib botserver botapp botdevice bottest botui + + # Force submodule update to match parent repo + git submodule foreach "git fetch origin main && git checkout origin/main || git checkout main || true" - mkdir -p /home/gbuser/target + mkdir -p /home/gbuser/target - name: Cache sccache uses: actions/cache@v4