v3.1.0-patch

Patch v3.1.0 to resolve wrong git-ftp version being used

README.md

@@ -23,7 +23,7 @@ jobs:
       with:
         fetch-depth: 2
     - name: FTP-Deploy-Action
-      uses: SamKirkland/FTP-Deploy-Action@3.1.1
+      uses: SamKirkland/FTP-Deploy-Action@3.1.0
       with:
         ftp-server: ftp://ftp.samkirkland.com/
         ftp-username: myFtpUserName
@@ -183,7 +183,7 @@ jobs:
       with:
         fetch-depth: 2
     - name: FTP-Deploy-Action
-      uses: SamKirkland/FTP-Deploy-Action@3.1.1
+      uses: SamKirkland/FTP-Deploy-Action@3.1.0
       with:
         ftp-server: ftp://ftp.samkirkland.com/
         ftp-username: myFtpUserName
@@ -212,7 +212,7 @@ jobs:
         fetch-depth: 2
 
     - name: FTP-Deploy-Action
-      uses: SamKirkland/FTP-Deploy-Action@3.1.1
+      uses: SamKirkland/FTP-Deploy-Action@3.1.0
       with:
         ftp-server: ftps://ftp.samkirkland.com:21/
         ftp-username: myFTPSUsername
@@ -259,7 +259,7 @@ jobs:
         fetch-depth: 2
 
     - name: FTP-Deploy-Action
-      uses: SamKirkland/FTP-Deploy-Action@3.1.1
+      uses: SamKirkland/FTP-Deploy-Action@3.1.0
       with:
         ftp-server: sftp://ftp.samkirkland.com:7280/
         ftp-username: mySFTPUsername
@@ -298,7 +298,7 @@ jobs:
       run: ls
       
     - name: FTP-Deploy-Action
-      uses: SamKirkland/FTP-Deploy-Action@3.1.1
+      uses: SamKirkland/FTP-Deploy-Action@3.1.0
       with:
         ftp-server: ftp://ftp.samkirkland.com/
         ftp-username: myFTPUsername
@@ -321,7 +321,7 @@ jobs:
         fetch-depth: 2
 
     - name: FTP-Deploy-Action
-      uses: SamKirkland/FTP-Deploy-Action@3.1.1
+      uses: SamKirkland/FTP-Deploy-Action@3.1.0
       with:
         ftp-server: ftp://ftp.samkirkland.com/
         ftp-username: myFTPUsername
@@ -418,24 +418,14 @@ jobs:
 ---
 
 ## Debugging locally
-##### Instructions for debugging Windows
+##### Instructions for debugging on windows
-- [Install docker](https://docs.docker.com/get-docker/)  
+- Install docker for windows
-- Open powershell **as Administrator**
+- Open powershell
-- Install [act-cli](https://github.com/nektos/act#installation) by running `choco install act-cli`
 - Navigate to the repo folder
-- Run `npm install` - this will install all dependencies to build this project
+- Run `docker build --tag action .`
-- Run `npm build` - this will build the action javascript and watch/rebuild when files change
+- Run `docker run action`
-- Run `npm run build-docker` - this will build the docker container (only needs to be done once)
-- Run `npm run run-docker` - this will spin up a local copy of the action defined in `/debug/local-debug-deployment.yaml`. Update package.json to set any secret values
   
-#### Instructions for debugging on Linux
+##### Instructions for debugging on linux
-- [Install docker](https://docs.docker.com/get-docker/) on a Debian-based distro you can run `sudo apt install docker docker.io`
+- Please submit a PR for linux instructions :)
-- Open the terminal
-- Install [act-cli](https://github.com/nektos/act#installation)
-- Navigate to the repo folder
-- Run `npm install` - this will install all dependencies to build this project
-- Run `npm build` - this will build the action javascript and watch/rebuild when files change
-- Run `npm run build-docker` - this will build the docker container (only needs to be done once)
-- Run `npm run run-docker` - this will spin up a local copy of the action defined in `/debug/local-debug-deployment.yaml`. Update package.json to set any secret values
 
 #### Pull Requests Welcome!

debug/local-debug-deployment.yaml

@@ -1,18 +0,0 @@
-on: push
-name: Local Debug Deployment
-jobs:
-  Local-Debug-Deployment:
-    name: Local-Debug-Deployment
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.1.0
-      with:
-        fetch-depth: 2
-    
-    - name: FTP-Deploy-Action
-      uses: ./
-      with:
-        ftp-server: ftp://ftp.samkirkland.com/
-        ftp-username: ${{ secrets.username }}
-        ftp-password: ${{ secrets.password }}
-        git-ftp-args: --dry-run

dist/index.js

@@ -1049,19 +1049,11 @@ function syncFiles(args) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             yield core.group("Uploading files", () => __awaiter(this, void 0, void 0, function* () {
-                return yield exec.exec("git ftp push", [
+                return yield exec.exec(`git ftp push --force --auto-init --verbose --syncroot ${args.local_dir} --user ${args.ftp_username} --passwd ${args.ftp_password} ${args.gitFtpArgs} ${args.ftp_server}`);
-                    "--force",
-                    "--auto-init",
-                    "--verbose",
-                    `--syncroot=${args.local_dir}`,
-                    `--user=${args.ftp_username}`,
-                    `--passwd=${args.ftp_password}`,
-                    args.gitFtpArgs,
-                    args.ftp_server
-                ]);
             }));
         }
         catch (error) {
+            console.error("⚠️ Failed to upload files");
             core.setFailed(error.message);
         }
     });

package.json

@@ -8,9 +8,10 @@
     "node": ">=12.0.0"
   },
   "scripts": {
-    "build": "ncc build src/main.ts -o dist --watch",
+    "build:dev": "tsc",
-    "build-docker": "docker build --tag action .",
+    "build:production": "ncc build src/main.ts -o dist",
-    "run-docker": "act --workflows ./debug/ --secret username=UserNameHere --secret password=PasswordHere"
+    "build:docker": "docker build --tag action .",
+    "run:docker": "docker run action --build-arg FTP_SERVER=example.com FTP_USERNAME=test@example.com FTP_PASSWORD=passwordExample"
   },
   "repository": {
     "type": "git",

src/main.ts

@@ -70,22 +70,11 @@ function withDefault(value: string, defaultValue: string) {
 async function syncFiles(args: IActionArguments) {
   try {
     await core.group("Uploading files", async () => {
-      return await exec.exec(
+      return await exec.exec(`git ftp push --force --auto-init --verbose --syncroot ${args.local_dir} --user ${args.ftp_username} --passwd ${args.ftp_password} ${args.gitFtpArgs} ${args.ftp_server}`);
-        "git ftp push",
-        [
-          "--force",
-          "--auto-init",
-          "--verbose",
-          `--syncroot=${args.local_dir}`,
-          `--user=${args.ftp_username}`,
-          `--passwd=${args.ftp_password}`,
-          args.gitFtpArgs!,
-          args.ftp_server!
-        ]
-      );
     });
   }
   catch (error) {
+    console.error("⚠️ Failed to upload files");
     core.setFailed(error.message);
   }
 }

src/types.ts

@@ -25,7 +25,7 @@ export enum gitFTPExitCode {
     ErrorWhileDownloading = 5,
     UnknownProtocol = 6,
     RemoteLocked = 7,
-    GitRelatedError = 8,
+    NotAGitProject = 8,
     PreFTPPushHookFailed = 9,
     LocalFileOperationFailed = 10
 }