From 3f5ef5c6fee34aa69cdb8db1869ec4fe95bc68d0 Mon Sep 17 00:00:00 2001 From: DontDDoS Date: Sun, 11 Jan 2026 00:57:12 +0000 Subject: [PATCH] ci: detect Hugo build output; add debug listing; robust rsync deploy --- .gitea/workflows/Hugo-deploy.yaml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/Hugo-deploy.yaml b/.gitea/workflows/Hugo-deploy.yaml index fc05c15..67b8fb8 100644 --- a/.gitea/workflows/Hugo-deploy.yaml +++ b/.gitea/workflows/Hugo-deploy.yaml @@ -35,6 +35,16 @@ jobs: run: | hugo -s website -d public + - name: Show build output + run: | + echo "CWD: $(pwd)" + hugo version + hugo -s website env + echo "Listing repo root:" && ls -la + echo "Listing website:" && ls -la website || true + echo "Listing public:" && ls -la public || true + echo "Listing website/public:" && ls -la website/public || true + - name: Configure SSH env: HUGO_DEPLOY_SSH_PRIVATE_KEY: ${{ secrets.HUGO_DEPLOY_SSH_PRIVATE_KEY }} @@ -42,8 +52,24 @@ jobs: mkdir -p ~/.ssh echo "$HUGO_DEPLOY_SSH_PRIVATE_KEY" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa + chmod 700 ~/.ssh - name: Deploy to server run: | - ssh -o StrictHostKeyChecking=no hugo-deploy@10.20.20.102 "mkdir -p /opt/containers/website/content" - rsync -avz --delete -e "ssh -o StrictHostKeyChecking=no" public/ hugo-deploy@10.20.20.102:/opt/containers/website/content/ + set -e + # detect source directory with built site + if [ -d public ] && [ "$(ls -A public 2>/dev/null)" ]; then + SRC=public + elif [ -d website/public ] && [ "$(ls -A website/public 2>/dev/null)" ]; then + SRC=website/public + else + echo "ERROR: no build output found in public/ or website/public/" + ls -la + exit 1 + fi + + echo "Deploying from $SRC" + + ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null hugo-deploy@10.20.20.102 "mkdir -p /opt/containers/website/content && rm -rf /opt/containers/website/content/*" + + rsync -avz --delete -e "ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" "$SRC"/ hugo-deploy@10.20.20.102:/opt/containers/website/content/