diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index a80ed7a..577e2ca 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,10 +24,8 @@ jobs: if command -v lftp >/dev/null 2>&1; then echo "✅ lftp bereits installiert" elif command -v apk >/dev/null 2>&1; then - echo "📦 Installiere via apk" apk add --no-cache lftp ca-certificates elif command -v apt-get >/dev/null 2>&1; then - echo "📦 Installiere via apt-get" apt-get update apt-get install -y lftp ca-certificates else @@ -40,11 +38,9 @@ jobs: if [ "${{ gitea.ref_name }}" = "main" ]; then echo "TARGET_PATH=${{ vars.FTP_PATH_PROD }}" >> "$GITHUB_ENV" echo "CONFIG_ENV_DIR=config/prod" >> "$GITHUB_ENV" - echo "ENVIRONMENT_NAME=production" >> "$GITHUB_ENV" elif [ "${{ gitea.ref_name }}" = "develop" ]; then echo "TARGET_PATH=${{ vars.FTP_PATH_STAGING }}" >> "$GITHUB_ENV" echo "CONFIG_ENV_DIR=config/staging" >> "$GITHUB_ENV" - echo "ENVIRONMENT_NAME=staging" >> "$GITHUB_ENV" else echo "Unsupported branch" exit 1 @@ -56,50 +52,29 @@ jobs: pwd ls -la - echo "📁 Prüfe & zeige Projektverzeichnisse:" - for d in $BASE_DIRS $CONFIG_BASE_DIR $CONFIG_ENV_DIR; do - echo "----------------------------------------" - if [ -d "$d" ]; then - echo "📂 Inhalt von $d/:" - ls -la "$d/" - else - echo "⚠️ Verzeichnis '$d' existiert nicht!" - fi - done - - name: Deploy via FTPS run: | set -e - echo "📁 Prüfe lokale Basisverzeichnisse..." - MISSING=0 + echo "🚀 Deploy to ${TARGET_PATH}" + + VALID_DIRS="" for d in $BASE_DIRS; do - if [ ! -d "$d" ]; then - echo "❌ Verzeichnis '$d/' fehlt im Repo!" - MISSING=1 + if [ -d "$d" ]; then + VALID_DIRS="$VALID_DIRS $d" + else + echo "⚠️ Überspringe fehlendes Verzeichnis: $d" fi done - if [ ! -d "$CONFIG_BASE_DIR" ]; then - echo "❌ Basis-Konfig-Verzeichnis '$CONFIG_BASE_DIR/' fehlt!" - MISSING=1 - fi - - if [ ! -d "$CONFIG_ENV_DIR" ]; then - echo "❌ Env-Konfiguration '$CONFIG_ENV_DIR/' fehlt!" - MISSING=1 - fi - - if [ "$MISSING" -ne 0 ]; then - echo "⛔ Abbruch wegen fehlender Verzeichnisse." + if [ -z "$VALID_DIRS" ]; then + echo "❌ Kein deploybares Verzeichnis gefunden." exit 1 fi - echo "🚀 Deploy ${ENVIRONMENT_NAME} → ${{ vars.FTP_HOST }}:${TARGET_PATH}" - - for d in $BASE_DIRS; do - echo "🔁 Sync ${d}/ → ${TARGET_PATH}${d}/" + for d in $VALID_DIRS; do + echo "🔁 ${d}/ → ${TARGET_PATH}${d}/" lftp -u "${{ secrets.FTP_USER }}","${{ secrets.FTP_PASSWORD }}" "${{ vars.FTP_HOST }}" -e " set ftp:ssl-force true; set ftp:passive-mode true; @@ -107,32 +82,34 @@ jobs: set ssl:verify-certificate no; mirror -R --delete --exclude .gitkeep ${d}/ ${TARGET_PATH}${d}/; bye - " || { echo "❌ Upload für Verzeichnis '${d}' fehlgeschlagen."; exit 1; } + " || exit 1 done - echo "🧩 Baue gemischtes Config-Verzeichnis..." - rm -rf .ci_config_deploy - mkdir -p .ci_config_deploy + if [ -d "$CONFIG_BASE_DIR" ] && [ -d "$CONFIG_ENV_DIR" ]; then + echo "🧩 Baue gemischtes Config-Verzeichnis" - for f in ${CONFIG_BASE_DIR}/*.php; do - if [ -f "$f" ]; then - echo "➕ Basis-Config-Datei: $f" - cp "$f" .ci_config_deploy/ - fi - done + rm -rf .ci_config_deploy + mkdir -p .ci_config_deploy - echo "➕ Env-Config aus ${CONFIG_ENV_DIR}/" - cp -R ${CONFIG_ENV_DIR}/. .ci_config_deploy/ + for f in ${CONFIG_BASE_DIR}/*.php; do + [ -f "$f" ] && cp "$f" .ci_config_deploy/ + done - echo "🔁 Sync .ci_config_deploy/ → ${TARGET_PATH}${CONFIG_BASE_DIR}/" - lftp -u "${{ secrets.FTP_USER }}","${{ secrets.FTP_PASSWORD }}" "${{ vars.FTP_HOST }}" -e " - set ftp:ssl-force true; - set ftp:passive-mode true; - set ftp:ssl-protect-data true; - set ssl:verify-certificate no; - lcd .ci_config_deploy; - mirror -R --delete --exclude .gitkeep ./ ${TARGET_PATH}${CONFIG_BASE_DIR}/; - bye - " || { echo "❌ Upload für Config fehlgeschlagen."; exit 1; } + cp -R ${CONFIG_ENV_DIR}/. .ci_config_deploy/ - echo "✅ Deploy ${ENVIRONMENT_NAME} abgeschlossen." \ No newline at end of file + echo "🔁 config → ${TARGET_PATH}${CONFIG_BASE_DIR}/" + + lftp -u "${{ secrets.FTP_USER }}","${{ secrets.FTP_PASSWORD }}" "${{ vars.FTP_HOST }}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + lcd .ci_config_deploy; + mirror -R --delete --exclude .gitkeep ./ ${TARGET_PATH}${CONFIG_BASE_DIR}/; + bye + " || exit 1 + else + echo "⚠️ Config-Deploy übersprungen: ${CONFIG_BASE_DIR} oder ${CONFIG_ENV_DIR} fehlt" + fi + + echo "✅ Deploy abgeschlossen" \ No newline at end of file