adsd

.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..."
+          echo "🚀 Deploy to ${TARGET_PATH}"
-          MISSING=0
+
+          VALID_DIRS=""
 
           for d in $BASE_DIRS; do
-            if [ ! -d "$d" ]; then
+            if [ -d "$d" ]; then
-              echo "❌ Verzeichnis '$d/' fehlt im Repo!"
+              VALID_DIRS="$VALID_DIRS $d"
-              MISSING=1
+            else
+              echo "⚠️ Überspringe fehlendes Verzeichnis: $d"
             fi
           done
 
-          if [ ! -d "$CONFIG_BASE_DIR" ]; then
+          if [ -z "$VALID_DIRS" ]; then
-            echo "❌ Basis-Konfig-Verzeichnis '$CONFIG_BASE_DIR/' fehlt!"
+            echo "❌ Kein deploybares Verzeichnis gefunden."
-            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."
             exit 1
           fi
 
-          echo "🚀 Deploy ${ENVIRONMENT_NAME} → ${{ vars.FTP_HOST }}:${TARGET_PATH}"
+          for d in $VALID_DIRS; do
-
+            echo "🔁 ${d}/ → ${TARGET_PATH}${d}/"
-          for d in $BASE_DIRS; do
-            echo "🔁 Sync ${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..."
+          if [ -d "$CONFIG_BASE_DIR" ] && [ -d "$CONFIG_ENV_DIR" ]; then
-          rm -rf .ci_config_deploy
+            echo "🧩 Baue gemischtes Config-Verzeichnis"
-          mkdir -p .ci_config_deploy
 
-          for f in ${CONFIG_BASE_DIR}/*.php; do
+            rm -rf .ci_config_deploy
-            if [ -f "$f" ]; then
+            mkdir -p .ci_config_deploy
-              echo "➕ Basis-Config-Datei: $f"
-              cp "$f" .ci_config_deploy/
-            fi
-          done
 
-          echo "➕ Env-Config aus ${CONFIG_ENV_DIR}/"
+            for f in ${CONFIG_BASE_DIR}/*.php; do
-          cp -R ${CONFIG_ENV_DIR}/. .ci_config_deploy/
+              [ -f "$f" ] && cp "$f" .ci_config_deploy/
+            done
 
-          echo "🔁 Sync .ci_config_deploy/ → ${TARGET_PATH}${CONFIG_BASE_DIR}/"
+            cp -R ${CONFIG_ENV_DIR}/. .ci_config_deploy/
-          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; }
 
-          echo "✅ Deploy ${ENVIRONMENT_NAME} abgeschlossen."
+            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"