Merge pull request #321 from wcoder/patch-1

Update default timeout info
v4.3.3
2026-04-10 12:32:17 +02:00 · 2022-12-02 10:45:56 -06:00 · 2022-12-02 10:44:37 -06:00 · 2022-12-02 10:30:34 -06:00 · 2022-11-18 21:07:09 +01:00 · 2022-09-12 23:26:17 +03:00
8 changed files with 2910 additions and 4061 deletions
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ jobs:
      uses: actions/checkout@v2
    
    - name: 📂 Sync files
-      uses: SamKirkland/FTP-Deploy-Action@4.3.0
+      uses: SamKirkland/FTP-Deploy-Action@4.3.3
      with:
        server: ftp.samkirkland.com
        username: myFtpUserName
@@ -33,7 +33,7 @@ jobs:
 ---

 ### Requirements
- You must have ftp access to your server. If your host requires ssh please use my web-deploy action (coming soon)
+- You must have ftp access to your server. If your host allows or requires ssh please use my [web-deploy](https://github.com/SamKirkland/web-deploy) action
 - Some web hosts change the default port (21), check with your host for your port number

 ---
@@ -70,6 +70,7 @@ I strongly recommend you store your `password` as a secret.
 | `exclude`               | No       | [See Example](#exclude-files) | [See Example](#exclude-files) | An array of glob patterns, these files will not be included in the publish/delete process. [List MUST be in this format](#exclude-files). You can use [a glob tester](https://www.digitalocean.com/community/tools/glob?comments=true&glob=%2A%2A%2F.git%2A%2F%2A%2A&matches=false&tests=test%2Fsam&tests=.git%2F&tests=.github%2F&tests=.git%2Ftest&tests=.gitattributes&tests=.gitignore&tests=.git%2Fconfig&tests=.git%2Ftest%2Ftest&tests=.github%2Fworkflows%2Fmain.yml&tests=test%2F.git%2Fworkflows%2Fmain.yml&tests=node_modules%2Ffolder%2F&tests=node_modules%2Fotherfolder%2F&tests=subfolder%2Fnode_modules%2F) to test your pattern(s). |
 | `log-level`             | No       | `minimal`                     | `standard`                    | `minimal`: only important info, `standard`: important info and basic file changes, `verbose`: print everything the script is doing                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `security`              | No       | `strict`                      | `loose`                       | `strict`: Reject any connection which is not authorized with the list of supplied CAs. `loose`: Allow connection even when the domain is not certificate                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `timeout`               | No       | `60000`                       | `30000`                       | Timeout in milliseconds for FTP operations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |


 # Common Examples
@@ -87,10 +88,10 @@ jobs:
    - name: 🚚 Get latest code
      uses: actions/checkout@v2

-    - name: Use Node.js 14
+    - name: Use Node.js 16
      uses: actions/setup-node@v2
      with:
-        node-version: '14'
+        node-version: '16'
      
    - name: 🔨 Build Project
      run: |
@@ -98,7 +99,7 @@ jobs:
        npm run build
    
    - name: 📂 Sync files
-      uses: SamKirkland/FTP-Deploy-Action@4.3.0
+      uses: SamKirkland/FTP-Deploy-Action@4.3.3
      with:
        server: ftp.samkirkland.com
        username: myFtpUserName
@@ -118,7 +119,7 @@ jobs:
      uses: actions/checkout@v2

    - name: 📂 Sync files
-      uses: SamKirkland/FTP-Deploy-Action@4.3.0
+      uses: SamKirkland/FTP-Deploy-Action@4.3.3
      with:
        server: ftp.samkirkland.com
        username: myFtpUserName
@@ -141,7 +142,7 @@ jobs:
      uses: actions/checkout@v2

    - name: 📂 Sync files
-      uses: SamKirkland/FTP-Deploy-Action@4.3.0
+      uses: SamKirkland/FTP-Deploy-Action@4.3.3
      with:
        server: ftp.samkirkland.com
        username: myFtpUserName
@@ -163,7 +164,7 @@ jobs:
      uses: actions/checkout@v2

    - name: 📂 Sync files
-      uses: SamKirkland/FTP-Deploy-Action@4.3.0
+      uses: SamKirkland/FTP-Deploy-Action@4.3.3
      with:
        server: ftp.samkirkland.com
        username: myFtpUserName
--- a/action.yml
+++ b/action.yml
@@ -41,9 +41,12 @@ inputs:
  security:
    required: false
    description: "strict or loose"
+  timeout:
+    required: false
+    description: "Timeout in milliseconds for FTP operations"
 runs:
-  using: "node12"
+  using: "node16"
  main: "dist/index.js"
 branding:
  icon: "upload-cloud"
-  color: "orange"
+  color: "blue"
--- a/dist/index.js
+++ b/dist/index.js
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,3 +0,0 @@
-module.exports = {
-    preset: "ts-jest"
-};
--- a/migration.md
+++ b/migration.md
@@ -27,7 +27,7 @@ Most features have been carried forward and improved upon. However, some feature
 ### How to upgrade

 1) Remove `with: fetch-depth: 2`. It is no longer needed and removing it will _slightly_ speed up deployments.
-2) Change the version to `4.X.X`, for example `SamKirkland/FTP-Deploy-Action@4.1.0` (please check readme for latest version)
+2) Change the version to `4.X.X`, for example `SamKirkland/FTP-Deploy-Action@4.3.1` (please check readme for latest version)
 3) If you have a `.git-ftp-include` file you should delete it. Version 4 tracks files differently and no longer needs this config file.
 4) If you have a `.git-ftp-ignore` file, you should transfer the options to the new `exclude` argument. _Note: Version 4 excludes any `.git*` and `node_modules/` files/folders by default_
 5) Update your arguments to reflect the following changes
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ftp-deploy-action",
-  "version": "4.3.0",
+  "version": "4.3.3",
  "private": true,
  "description": "Automate deploying websites and more with this GitHub action",
  "main": "dist/index.js",
@@ -22,20 +22,23 @@
  "author": "Sam Kirkland",
  "license": "MIT",
  "dependencies": {
-    "@actions/core": "^1.6.0",
-    "@samkirkland/ftp-deploy": "^1.2.1",
-    "@types/jest": "^27.0.2",
-    "jest": "^27.2.5",
-    "ts-jest": "^27.0.5",
-    "ts-node-dev": "^1.1.8"
+    "@actions/core": "^1.9.1",
+    "@samkirkland/ftp-deploy": "^1.2.2",
+    "@types/jest": "^28.1.7",
+    "jest": "^28.1.3",
+    "ts-jest": "^28.0.8",
+    "ts-node-dev": "^2.0.0"
  },
  "devDependencies": {
    "@types/node": "^14.0.27",
-    "@typescript-eslint/eslint-plugin": "^4.28.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "@vercel/ncc": "^0.31.1",
-    "eslint": "^7.29.0",
-    "eslint-plugin-jest": "^24.3.6",
-    "typescript": "^4.4.3"
+    "@typescript-eslint/eslint-plugin": "^5.33.1",
+    "@typescript-eslint/parser": "^5.33.1",
+    "@vercel/ncc": "^0.34.0",
+    "eslint": "^8.22.0",
+    "eslint-plugin-jest": "^26.8.7",
+    "typescript": "^4.7.4"
+  },
+  "jest": {
+    "preset": "ts-jest"
  }
 }
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,7 +18,8 @@ async function runDeployment() {
      "dangerous-clean-slate": optionalBoolean("dangerous-clean-slate", core.getInput("dangerous-clean-slate")),
      "exclude": optionalStringArray("exclude", core.getMultilineInput("exclude")),
      "log-level": optionalLogLevel("log-level", core.getInput("log-level")),
-      "security": optionalSecurity("security", core.getInput("security"))
+      "security": optionalSecurity("security", core.getInput("security")),
+      "timeout": optionalInt("timeout", core.getInput("timeout"))
    };

    await deploy(args);
Author	SHA1	Message	Date
Sam Kirkland	cfcb39fa3c	Merge pull request #321 from wcoder/patch-1 Update default timeout info	2022-12-02 10:45:56 -06:00
SamKirkland	1d198bef28	v4.3.3	2022-12-02 10:44:37 -06:00
Sam Kirkland	b8e4443bb0	Merge pull request #338 from the-snowwhite/nodejs_update Update from node12 to node16	2022-12-02 10:30:34 -06:00
the-snowwhite	84f66893ce	Update from node12 to node16 Signed-off-by: the-snowwhite <producer@holotronic.dk>	2022-11-18 21:07:09 +01:00
Yauheni Pakala	0734c4dc18	Update default timeout info Based on latest `3c410ee1b4/README.md`	2022-09-12 23:26:17 +03:00
SamKirkland	ec28745b59	blue marketplace icon	2022-09-03 17:40:42 -05:00
SamKirkland	1b21034a8d	v4.3.2	2022-09-03 17:37:57 -05:00
Sam Kirkland	ed91728692	Merge pull request #317 from Marvimoto/patch-1 Add timeout to valid inputs to resolve #316	2022-08-30 09:06:05 -05:00
Marvimoto	118eb423de	Add timeout to valid inputs	2022-08-29 19:14:03 +02:00
Sam Kirkland	e8964f3093	Merge pull request #313 from SamKirkland/4.3.1 4.3.1	2022-08-21 21:28:39 -05:00
SamKirkland	f458cc0704	Merge branch 'master' into 4.3.1	2022-08-21 21:24:37 -05:00
Sam Kirkland	01dea7c17f	Merge pull request #282 from unverbraucht/master Allow setting the timeout.	2022-08-21 21:24:08 -05:00
SamKirkland	16956be3a6	4.3.1 release Upgrade basic-ftp library Update npm libraries Resolves #308	2022-08-21 21:21:46 -05:00
Kevin Read	4f0dc298db	Allow setting the timeout.	2022-04-19 14:36:22 +02:00