diff --git a/workflows/u/antigravity/git_sync__flow/a.sh b/workflows/u/antigravity/git_sync__flow/a.sh index 3c75a17..25cf1c4 100644 --- a/workflows/u/antigravity/git_sync__flow/a.sh +++ b/workflows/u/antigravity/git_sync__flow/a.sh @@ -2,10 +2,10 @@ set -e export PATH=/usr/bin:/usr/local/bin:/usr/sbin:/sbin:/bin:$PATH -GREEN="" -YELLOW="" -RED="" -NC="" +GREEN="\033[0;32m" +YELLOW="\033[1;33m" +RED="\033[0;31m" +NC="\033[0m" echo -e "${GREEN}=== Windmill Workflow Git Sync ===${NC}" @@ -22,6 +22,19 @@ git config --global --add safe.directory "$REPO_ROOT" git config --global user.email "bot@keinafarm.net" git config --global user.name "Windmill Bot" +# sync ブランチを使用 +CURRENT_BRANCH=$(git -C "$REPO_ROOT" rev-parse --abbrev-ref HEAD) +if [ "$CURRENT_BRANCH" != "sync" ]; then + echo -e "${YELLOW}Switching to sync branch...${NC}" + git -C "$REPO_ROOT" fetch origin sync + git -C "$REPO_ROOT" checkout sync +fi + +echo -e "${YELLOW}Pulling from origin/sync...${NC}" +git -C "$REPO_ROOT" pull --rebase origin sync || { + echo -e "${RED}Failed to pull from remote. Continuing...${NC}" +} + echo -e "${YELLOW}Pulling from Windmill...${NC}" cd "$WMILL_DIR" wmill sync pull --config-dir /workspace/wmill_config --skip-variables --skip-secrets --skip-resources --yes || exit 1 @@ -32,15 +45,12 @@ if [[ -n $(git status --porcelain) ]]; then git add -A TIMESTAMP=$(date "+%Y-%m-%d %H:%M:%S") git commit -m "Auto-sync: ${TIMESTAMP}" - echo -e "${YELLOW}Pushing to Gitea...${NC}" - git pull --rebase origin main || { - echo -e "${RED}Failed to pull from remote. Trying push anyway...${NC}" - } - git push origin main || { + echo -e "${YELLOW}Pushing to Gitea (sync branch)...${NC}" + git push origin sync || { echo -e "${RED}Failed to push.${NC}" exit 1 } - echo -e "${GREEN}Changes pushed to Gitea${NC}" + echo -e "${GREEN}Changes pushed to Gitea (sync branch)${NC}" else echo -e "${GREEN}No changes detected${NC}" fi diff --git a/workflows/u/antigravity/git_sync__flow/flow.yaml b/workflows/u/antigravity/git_sync__flow/flow.yaml index cf6f6bd..2eba55e 100644 --- a/workflows/u/antigravity/git_sync__flow/flow.yaml +++ b/workflows/u/antigravity/git_sync__flow/flow.yaml @@ -1,5 +1,5 @@ summary: Git Sync Workflow -description: Automatically sync Windmill workflows to Git repository +description: Automatically sync Windmill workflows to Git repository (sync branch) value: modules: - id: a @@ -9,9 +9,4 @@ value: input_transforms: {} lock: '' language: bash -schema: - $schema: 'https://json-schema.org/draft/2020-12/schema' - type: object - order: [] - properties: {} - required: [] +schema: null diff --git a/workflows/wmill-lock.yaml b/workflows/wmill-lock.yaml index 518e086..1165aa0 100644 --- a/workflows/wmill-lock.yaml +++ b/workflows/wmill-lock.yaml @@ -14,8 +14,8 @@ locks: g/all/setup_app__app+__app_hash: d71add32e14e552d1a4c861c972a50d9598b07c0af201bbadec5b59bbd99d7e3 g/all/setup_app__app+change_account.deno.ts: 3c592cac27e9cdab0de6ae19270bcb08c7fa54355ad05253a12de2351894346b u/admin/hub_sync: aaf9fd803fa229f3029d1bb02bbe3cc422fce680cad39c4eec8dd1da115de102 - u/antigravity/git_sync__flow+__flow_hash: 66cdf1feb6136bb87f65a050266840e7b074a136f4b752bd01dbe524eb8f05d7 - u/antigravity/git_sync__flow+a.sh: 3094bf5aed54e3232c6e0260fa0b3f3849f7fc19930ec2a8395fcfe437cdbe8f + u/antigravity/git_sync__flow+__flow_hash: 5a7194ef6bf1ce5529e70ae74fdb4cd05a0da662c78bfa355bb7e98698689ae6 + u/antigravity/git_sync__flow+a.sh: ac7fdc83548f305fed33389129b79439e0c40077ed39a410477c77d08dca0ca9 u/antigravity/hello_world_demo__flow+__flow_hash: 0adc341960f8196454876684f85fe14ef087ba470322d2aabc99b37bf61edac9 u/antigravity/hello_world_demo__flow+a.ts: 53669a285c16d4ba322888755a33424521f769e9ebf64fc1f0cb21f9952b5958 u/antigravity/test_git_sync: 3aa9e66ad8c87f1c2718d41d78ce3b773ce20743e4a1011396edbe2e7f88ac51