From c4469ea117b72de0c07903d828fe9bd32ce93152 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 00:37:03 -0400 Subject: [PATCH 01/15] ftp test --- .github/workflows/ftp-deploy.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index c512883..3205359 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -38,8 +38,14 @@ jobs: # Copy all .php files while preserving directory structure, but exclude the config folder # --prune-empty-dirs removes directories that would be empty after filtering rsync -av --prune-empty-dirs \ - --include='*/' --include='*.php' \ - --exclude='config/**' --exclude='library/mailFunctions.php' --exclude='tests/**' --exclude='mail/**' --exclude='*' ./ deploy/ + --include='*/' \ + --include='*.php' \ + --exclude='config/**' \ + --exclude='library/mailFunctions.php' \ + --exclude='tests/**' \ + --exclude='mail/**' \ + --exclude='*' \ + ./ deploy/ # Ensure specific asset directories are included for d in assets css images examples; do From f4e3009c2e27ed46dc986fbb0c0c946e0a8f0cb6 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 00:38:18 -0400 Subject: [PATCH 02/15] another update --- .github/workflows/ftp-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 3205359..5080eea 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -16,8 +16,8 @@ on: # type: boolean # default: true # tmp comment out after testing - # pull_request: - # branches: [master] + pull_request: + branches: [master] jobs: deploy: From 0951ae37c89234d5e0f404b12426c25e5bae5307 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 00:43:30 -0400 Subject: [PATCH 03/15] more rsync updates --- .github/workflows/ftp-deploy.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 5080eea..4fb0fd2 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -38,13 +38,18 @@ jobs: # Copy all .php files while preserving directory structure, but exclude the config folder # --prune-empty-dirs removes directories that would be empty after filtering rsync -av --prune-empty-dirs \ - --include='*/' \ --include='*.php' \ --exclude='config/**' \ --exclude='library/mailFunctions.php' \ --exclude='tests/**' \ --exclude='mail/**' \ - --exclude='*' \ + ./ deploy/ + + rsync -av --prune-empty-dirs \ + --include='css/**' \ + --include='images/**' \ + --include='assets/**' \ + --include='examples/**' \ ./ deploy/ # Ensure specific asset directories are included From 6b8d5501233f26d655aaf3f54ee9d2774d27e073 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 00:47:29 -0400 Subject: [PATCH 04/15] try 3 --- .github/workflows/ftp-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 4fb0fd2..749af27 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -43,6 +43,7 @@ jobs: --exclude='library/mailFunctions.php' \ --exclude='tests/**' \ --exclude='mail/**' \ + --exclude='*' \ ./ deploy/ rsync -av --prune-empty-dirs \ From c3cc7796739ee0c5cbe35b77ca0e165a2edd57b7 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 00:49:40 -0400 Subject: [PATCH 05/15] try 4 --- .github/workflows/ftp-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 749af27..9ff2c3b 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -38,6 +38,9 @@ jobs: # Copy all .php files while preserving directory structure, but exclude the config folder # --prune-empty-dirs removes directories that would be empty after filtering rsync -av --prune-empty-dirs \ + --include='*/' \ + --include='*.php' \ + --exclude='.git/**' \ --include='*.php' \ --exclude='config/**' \ --exclude='library/mailFunctions.php' \ From 521088480d696ad085411978cea1591ce896997b Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 00:52:32 -0400 Subject: [PATCH 06/15] try 5 --- .github/workflows/ftp-deploy.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 9ff2c3b..ce6642b 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -38,15 +38,8 @@ jobs: # Copy all .php files while preserving directory structure, but exclude the config folder # --prune-empty-dirs removes directories that would be empty after filtering rsync -av --prune-empty-dirs \ - --include='*/' \ --include='*.php' \ - --exclude='.git/**' \ - --include='*.php' \ - --exclude='config/**' \ - --exclude='library/mailFunctions.php' \ - --exclude='tests/**' \ - --exclude='mail/**' \ - --exclude='*' \ + --exclude={.git,config,library/mailFunctions.php,tests,mail} ./ deploy/ rsync -av --prune-empty-dirs \ From 2e34a1fabbdc9d7f1adfd85304b7961faffb4da1 Mon Sep 17 00:00:00 2001 From: mari Date: Sat, 1 Nov 2025 01:08:19 -0400 Subject: [PATCH 07/15] rsync updates --- .github/workflows/ftp-deploy.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index ce6642b..a9a5480 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -36,18 +36,25 @@ jobs: mkdir -p deploy # Copy all .php files while preserving directory structure, but exclude the config folder - # --prune-empty-dirs removes directories that would be empty after filtering + # --prune-empty-dirs removes directories that would be empty after filtering --dry-run rsync -av --prune-empty-dirs \ + --exclude='config' \ + --exclude='library/mailFunctions.php' \ + --exclude='tests' \ + --exclude='mail' \ --include='*.php' \ - --exclude={.git,config,library/mailFunctions.php,tests,mail} + --include='*/' \ + --exclude='*' \ ./ deploy/ - rsync -av --prune-empty-dirs \ - --include='css/**' \ - --include='images/**' \ - --include='assets/**' \ - --include='examples/**' \ - ./ deploy/ + # rsync -av --prune-empty-dirs \ + # --include='css/**' \ + # --include='images/**' \ + # --include='assets/**' \ + # --include='examples/**' \ + # --include='*/' \ + # --exclude='*' \ + # ./ deploy/ # Ensure specific asset directories are included for d in assets css images examples; do From 742eb152a42c248e91fd8bc0bf40b58e098f589a Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 01:15:28 -0400 Subject: [PATCH 08/15] sftp upload --- .github/workflows/ftp-deploy.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index ce6642b..1d23c49 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -59,14 +59,23 @@ jobs: echo "Deploy package contents:" find deploy -maxdepth 4 -type f | sed -n '1,200p' - - name: Deploy to FTP server - uses: SamKirkland/FTP-Deploy-Action@4.3.0 + - name: Upload via SFTP + uses: appleboy/sftp-action@v0.1.4 with: - server: ${{ secrets.FTP_SERVER }} + host: ${{ secrets.FTP_SERVER }} username: ${{ secrets.FTP_USER }} password: ${{ secrets.FTP_PASSWORD }} port: ${{ secrets.FTP_PORT }} - local-dir: deploy/ + source: "deploy/*" + target: "/" + # - name: Deploy to FTP server + # uses: SamKirkland/FTP-Deploy-Action@4.3.0 + # with: + # server: ${{ secrets.FTP_SERVER }} + # username: ${{ secrets.FTP_USER }} + # password: ${{ secrets.FTP_PASSWORD }} + # port: ${{ secrets.FTP_PORT }} + # local-dir: deploy/ # server-dir: / # ${{ secrets.FTP_REMOTE_DIR }} From 8e8b14d19da6a89d4091004ccf57d062a6d41f1e Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 21:54:01 -0400 Subject: [PATCH 09/15] sftp --- .github/workflows/ftp-deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 33eafe7..05b0edc 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -67,7 +67,7 @@ jobs: find deploy -maxdepth 4 -type f | sed -n '1,200p' - name: Upload via SFTP - uses: appleboy/sftp-action@v0.1.4 + uses: appleboy/scp-action@v1 with: host: ${{ secrets.FTP_SERVER }} username: ${{ secrets.FTP_USER }} @@ -75,6 +75,7 @@ jobs: port: ${{ secrets.FTP_PORT }} source: "deploy/*" target: "/" + # - name: Deploy to FTP server # uses: SamKirkland/FTP-Deploy-Action@4.3.0 # with: From e91af45deb1c0855a06390583d895e614943d7ea Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 22:02:19 -0400 Subject: [PATCH 10/15] debug --- .github/workflows/ftp-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 05b0edc..5a5c2ae 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -75,6 +75,7 @@ jobs: port: ${{ secrets.FTP_PORT }} source: "deploy/*" target: "/" + debug: true # - name: Deploy to FTP server # uses: SamKirkland/FTP-Deploy-Action@4.3.0 From 800a444b8b179e38a833ab2329d1400ae7e61437 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 22:06:53 -0400 Subject: [PATCH 11/15] another sftp upload --- .github/workflows/ftp-deploy.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 5a5c2ae..4ebe2fb 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -66,16 +66,22 @@ jobs: echo "Deploy package contents:" find deploy -maxdepth 4 -type f | sed -n '1,200p' - - name: Upload via SFTP - uses: appleboy/scp-action@v1 - with: - host: ${{ secrets.FTP_SERVER }} - username: ${{ secrets.FTP_USER }} - password: ${{ secrets.FTP_PASSWORD }} - port: ${{ secrets.FTP_PORT }} - source: "deploy/*" - target: "/" - debug: true + - name: Manual SFTP Upload + run: | + echo "Starting manual SFTP upload..." + echo "put deploy/*" > sftp_batch.txt + sftp -P ${{ secrets.FTP_PORT }} -b sftp_batch.txt ${{ secrets.FTP_USER }}@${{ secrets.FTP_SERVER }} + + # - name: Upload via SFTP + # uses: appleboy/scp-action@v1 + # with: + # host: ${{ secrets.FTP_SERVER }} + # username: ${{ secrets.FTP_USER }} + # password: ${{ secrets.FTP_PASSWORD }} + # port: ${{ secrets.FTP_PORT }} + # source: "deploy/*" + # target: "/" + # debug: true # - name: Deploy to FTP server # uses: SamKirkland/FTP-Deploy-Action@4.3.0 From d3124037b17dcf9cb3ac52b6942735ae275bb2b9 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 22:08:01 -0400 Subject: [PATCH 12/15] try again --- .github/workflows/ftp-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 4ebe2fb..f886a4e 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -70,7 +70,7 @@ jobs: run: | echo "Starting manual SFTP upload..." echo "put deploy/*" > sftp_batch.txt - sftp -P ${{ secrets.FTP_PORT }} -b sftp_batch.txt ${{ secrets.FTP_USER }}@${{ secrets.FTP_SERVER }} + sftp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P ${{ secrets.FTP_PORT }} -b sftp_batch.txt ${{ secrets.FTP_USER }}@${{ secrets.FTP_SERVER }} # - name: Upload via SFTP # uses: appleboy/scp-action@v1 From d23cacacfccf89ce5733ebf650e5febdec0c7d36 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 22:10:47 -0400 Subject: [PATCH 13/15] embed password? --- .github/workflows/ftp-deploy.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index f886a4e..3aec021 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -70,7 +70,12 @@ jobs: run: | echo "Starting manual SFTP upload..." echo "put deploy/*" > sftp_batch.txt - sftp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P ${{ secrets.FTP_PORT }} -b sftp_batch.txt ${{ secrets.FTP_USER }}@${{ secrets.FTP_SERVER }} + sshpass -p "${{ secrets.FTP_PASSWORD }}" \ + sftp -o StrictHostKeyChecking=no \ + -o UserKnownHostsFile=/dev/null \ + -P ${{ secrets.FTP_PORT }} \ + -b sftp_batch.txt \ + ${{ secrets.FTP_USER }}@${{ secrets.FTP_SERVER }} # - name: Upload via SFTP # uses: appleboy/scp-action@v1 From f3b17365d1c17756935abd1836e1a82eb47ff6b4 Mon Sep 17 00:00:00 2001 From: lastlink Date: Sat, 1 Nov 2025 22:19:33 -0400 Subject: [PATCH 14/15] another password attempt --- .github/workflows/ftp-deploy.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index 3aec021..b3fcb71 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -69,14 +69,20 @@ jobs: - name: Manual SFTP Upload run: | echo "Starting manual SFTP upload..." + echo "put deploy/*" > sftp_batch.txt - sshpass -p "${{ secrets.FTP_PASSWORD }}" \ + export SSHPASS=${{ secrets.FTP_PASSWORD }} + sshpass -e \ sftp -o StrictHostKeyChecking=no \ -o UserKnownHostsFile=/dev/null \ -P ${{ secrets.FTP_PORT }} \ -b sftp_batch.txt \ ${{ secrets.FTP_USER }}@${{ secrets.FTP_SERVER }} + # sshpass -p "${{ secrets.FTP_PASSWORD }}" sftp user@host + # lftp -u "$FTP_USER","$FTP_PASSWORD" -p 221 sftp://$FTP_SERVER < Date: Sat, 1 Nov 2025 22:50:27 -0400 Subject: [PATCH 15/15] paused --- .github/workflows/ftp-deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ftp-deploy.yml b/.github/workflows/ftp-deploy.yml index b3fcb71..6a5c6c7 100644 --- a/.github/workflows/ftp-deploy.yml +++ b/.github/workflows/ftp-deploy.yml @@ -6,8 +6,8 @@ concurrency: cancel-in-progress: true on: - push: - branches: [ master ] + # push: + # branches: [ master ] workflow_dispatch: # inputs: # build_windows: @@ -16,8 +16,8 @@ on: # type: boolean # default: true # tmp comment out after testing - pull_request: - branches: [master] + # pull_request: + # branches: [master] jobs: deploy: