From 88429341bc563eb259304532364e78064c67d6c6 Mon Sep 17 00:00:00 2001 From: traveler Date: Wed, 14 Jan 2026 21:52:47 -0600 Subject: [PATCH] back to chatgpt deploy --- .forgejo/workflows/deploy.yml | 212 ++++++++++++++++++---------------- 1 file changed, 115 insertions(+), 97 deletions(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 860c43e..4557511 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -5,145 +5,163 @@ on: branches: ["master"] jobs: + detect: + runs-on: docker2 + outputs: + swarm_files: ${{ steps.changes.outputs.swarm_files }} + compose_matrix: ${{ steps.changes.outputs.compose_matrix }} + steps: + - name: Checkout repository (git clone, no node) + shell: bash + env: + CLONE_URL: ${{ github.server_url }}/${{ github.repository }}.git + BRANCH: ${{ github.ref_name }} + run: | + set -euo pipefail + rm -rf repo + git clone --branch "$BRANCH" --depth 50 "$CLONE_URL" repo + cd repo + git fetch --depth 50 origin "${{ github.sha }}" + git checkout -q "${{ github.sha }}" + + - name: Detect changed YAML files + id: changes + shell: bash + run: | + set -euo pipefail + cd repo + + BASE="${{ github.event.before }}" + HEAD="${{ github.sha }}" + + if [ -z "$BASE" ] || [ "$BASE" = "0000000000000000000000000000000000000000" ]; then + BASE="$(git rev-parse "${HEAD}~1" || true)" + fi + + if [ -z "$BASE" ]; then + echo "No base commit found; deploying nothing." + echo "swarm_files=" >> "$GITHUB_OUTPUT" + echo 'compose_matrix={"include":[]}' >> "$GITHUB_OUTPUT" + exit 0 + fi + + CHANGED="$(git diff --name-only "$BASE" "$HEAD" || true)" + echo "Changed files:" + echo "$CHANGED" + + # -------------------- + # Swarm stacks live in: swarm/*.yml|yaml + # -------------------- + SWARM_FILES="$(echo "$CHANGED" | grep -E '^swarm/.*\.ya?ml$' || true)" + echo "swarm_files=$(echo "$SWARM_FILES" | xargs)" >> "$GITHUB_OUTPUT" + + # -------------------- + # Compose YAMLs live in: services/compose///.yml|yaml + # (If yours are actually compose///..., tell me and I’ll adjust) + # -------------------- + COMPOSE_FILES="$(echo "$CHANGED" | grep -E '^services/compose/[^/]+/[^/]+/.*\.ya?ml$' || true)" + + JSON='{"include":[' + FIRST=1 + while read -r FILE; do + [ -z "$FILE" ] && continue + HOST="$(echo "$FILE" | awk -F/ '{print $3}')" + if [ $FIRST -eq 0 ]; then JSON+=','; fi + FIRST=0 + JSON+="{\"host\":\"$HOST\",\"file\":\"$FILE\"}" + done <<< "$COMPOSE_FILES" + JSON+=']}' + + echo "compose_matrix=$JSON" >> "$GITHUB_OUTPUT" + echo "compose_matrix=$JSON" + deploy_swarm: + needs: detect + if: ${{ needs.detect.outputs.swarm_files != '' }} runs-on: docker2 container: image: docker:27-cli volumes: - /var/run/docker.sock:/var/run/docker.sock steps: - - name: Checkout repository + - name: Checkout repository (git clone, no node) shell: sh env: CLONE_URL: ${{ github.server_url }}/${{ github.repository }}.git BRANCH: ${{ github.ref_name }} run: | set -e - git clone --branch "$BRANCH" --depth 1 "$CLONE_URL" repo + rm -rf repo + git clone --branch "$BRANCH" --depth 50 "$CLONE_URL" repo cd repo + git fetch --depth 50 origin "${{ github.sha }}" git checkout -q "${{ github.sha }}" - - name: Detect and deploy swarm stacks + - name: Validate swarm stacks shell: sh run: | set -e cd repo - - BASE="${{ github.event.before }}" - HEAD="${{ github.sha }}" - - # Handle first commit or missing base - if [ -z "$BASE" ] || [ "$BASE" = "0000000000000000000000000000000000000000" ]; then - git fetch --depth 2 origin "$HEAD" - BASE="$(git rev-parse "${HEAD}~1" 2>/dev/null || echo "")" - else - git fetch --depth 1 origin "$BASE" - fi - - if [ -z "$BASE" ]; then - echo "No base commit found; skipping swarm deployment." - exit 0 - fi - - # Find changed swarm files - SWARM_FILES="$(git diff --name-only "$BASE" "$HEAD" | grep -E '^swarm/.*\.ya?ml$' || true)" - - if [ -z "$SWARM_FILES" ]; then - echo "No swarm stack changes detected." - exit 0 - fi - - echo "Changed swarm files: $SWARM_FILES" - - # Validate and deploy each stack - for f in $SWARM_FILES; do - if [ ! -f "$f" ]; then - echo "Warning: $f not found, skipping" - continue - fi - - STACK="$(basename "$f" | sed 's/\.ya\?ml$//')" - echo "Validating stack: $STACK" + for f in ${{ needs.detect.outputs.swarm_files }}; do + echo "Validating swarm stack file: $f" docker stack config -c "$f" >/dev/null - - echo "Deploying stack: $STACK" + done + + - name: Deploy swarm stacks + shell: sh + run: | + set -e + cd repo + for f in ${{ needs.detect.outputs.swarm_files }}; do + STACK="$(basename "$f" | sed 's/\.ya\?ml$//')" + echo "Deploying swarm stack: $STACK from $f" docker stack deploy -c "$f" "$STACK" done deploy_compose: - runs-on: docker2 + needs: detect + if: ${{ needs.detect.outputs.compose_matrix != '' }} + strategy: + fail-fast: false + matrix: ${{ fromJSON(needs.detect.outputs.compose_matrix) }} + runs-on: ${{ matrix.host }} container: image: docker:27-cli volumes: - /var/run/docker.sock:/var/run/docker.sock steps: - - name: Install docker compose + - name: Install docker compose plugin shell: sh - run: apk add --no-cache docker-cli-compose + run: | + set -e + apk add --no-cache docker-cli-compose - - name: Checkout repository + - name: Checkout repository (git clone, no node) shell: sh env: CLONE_URL: ${{ github.server_url }}/${{ github.repository }}.git BRANCH: ${{ github.ref_name }} run: | set -e - git clone --branch "$BRANCH" --depth 1 "$CLONE_URL" repo + rm -rf repo + git clone --branch "$BRANCH" --depth 50 "$CLONE_URL" repo cd repo + git fetch --depth 50 origin "${{ github.sha }}" git checkout -q "${{ github.sha }}" - - name: Detect and deploy compose files + - name: Validate compose file shell: sh run: | set -e cd repo - - BASE="${{ github.event.before }}" - HEAD="${{ github.sha }}" - - # Handle first commit or missing base - if [ -z "$BASE" ] || [ "$BASE" = "0000000000000000000000000000000000000000" ]; then - git fetch --depth 2 origin "$HEAD" - BASE="$(git rev-parse "${HEAD}~1" 2>/dev/null || echo "")" - else - git fetch --depth 1 origin "$BASE" - fi - - if [ -z "$BASE" ]; then - echo "No base commit found; skipping compose deployment." - exit 0 - fi - - # Find changed compose files - COMPOSE_FILES="$(git diff --name-only "$BASE" "$HEAD" | grep -E '^services/compose/[^/]+/[^/]+/.*\.ya?ml$' || true)" - - if [ -z "$COMPOSE_FILES" ]; then - echo "No compose file changes detected." - exit 0 - fi - - echo "Changed compose files: $COMPOSE_FILES" - - # Group files by host and deploy - echo "$COMPOSE_FILES" | while read -r FILE; do - [ -z "$FILE" ] && continue - - if [ ! -f "$FILE" ]; then - echo "Warning: $FILE not found, skipping" - continue - fi - - HOST="$(echo "$FILE" | awk -F/ '{print $3}')" - - # Only deploy if we're on the correct host - if [ "$HOST" = "docker2" ] || [ "$HOST" = "$(hostname)" ]; then - echo "Validating: $FILE" - docker compose -f "$FILE" config -q - - echo "Deploying: $FILE" - docker compose -f "$FILE" pull - docker compose -f "$FILE" up -d --remove-orphans - else - echo "Skipping $FILE (requires host: $HOST)" - fi - done \ No newline at end of file + echo "Validating compose file: ${{ matrix.file }}" + docker compose -f "${{ matrix.file }}" config -q + + - name: Deploy compose file + shell: sh + run: | + set -e + cd repo + echo "Deploying compose file: ${{ matrix.file }}" + docker compose -f "${{ matrix.file }}" pull + docker compose -f "${{ matrix.file }}" up -d --remove-orphans