Compare commits

2 Commits

Author SHA1 Message Date
Sam Kirkland
fe9c9aad11 v4.3.6 2025-08-26 00:34:57 -05:00
Sam Kirkland
50e2cefbcc v4.3.6 2025-08-26 00:29:03 -05:00
5 changed files with 25 additions and 14 deletions

View File

@@ -23,7 +23,7 @@ jobs:
uses: actions/checkout@v4
- name: 📂 Sync files
uses: SamKirkland/FTP-Deploy-Action@v4.3.5
uses: SamKirkland/FTP-Deploy-Action@v4.3.6
with:
server: ftp.samkirkland.com
username: myFtpUserName
@@ -99,7 +99,7 @@ jobs:
npm run build
- name: 📂 Sync files
uses: SamKirkland/FTP-Deploy-Action@v4.3.5
uses: SamKirkland/FTP-Deploy-Action@v4.3.6
with:
server: ftp.samkirkland.com
username: myFtpUserName
@@ -119,7 +119,7 @@ jobs:
uses: actions/checkout@v4
- name: 📂 Sync files
uses: SamKirkland/FTP-Deploy-Action@v4.3.5
uses: SamKirkland/FTP-Deploy-Action@v4.3.6
with:
server: ftp.samkirkland.com
username: myFtpUserName
@@ -142,7 +142,7 @@ jobs:
uses: actions/checkout@v4
- name: 📂 Sync files
uses: SamKirkland/FTP-Deploy-Action@v4.3.5
uses: SamKirkland/FTP-Deploy-Action@v4.3.6
with:
server: ftp.samkirkland.com
username: myFtpUserName
@@ -164,7 +164,7 @@ jobs:
uses: actions/checkout@v4
- name: 📂 Sync files
uses: SamKirkland/FTP-Deploy-Action@v4.3.5
uses: SamKirkland/FTP-Deploy-Action@v4.3.6
with:
server: ftp.samkirkland.com
username: myFtpUserName

12
dist/index.js vendored
View File

@@ -3626,7 +3626,7 @@ class FTPSyncProvider {
}
catch (e) {
// this error is common when a file was deleted on the server directly
if (e.code === types_1.ErrorCode.FileNotFoundOrNoAccess) {
if ((e === null || e === void 0 ? void 0 : e.code) === types_1.ErrorCode.FileNotFoundOrNoAccess) {
this.logger.standard("File not found or you don't have access to the file - skipping...");
}
else {
@@ -3643,8 +3643,18 @@ class FTPSyncProvider {
const absoluteFolderPath = "/" + (this.serverPath.startsWith("./") ? this.serverPath.replace("./", "") : this.serverPath) + folderPath;
this.logger.all(`removing folder "${absoluteFolderPath}"`);
if (this.dryRun === false) {
try {
yield (0, utilities_1.retryRequest)(this.logger, () => __awaiter(this, void 0, void 0, function* () { return yield this.client.removeDir(absoluteFolderPath); }));
}
catch (e) {
if ((e === null || e === void 0 ? void 0 : e.code) === types_1.ErrorCode.FileNotFoundOrNoAccess) {
this.logger.standard("Directory not found or you don't have access to the file - skipping...");
}
else {
throw e;
}
}
}
this.logger.verbose(` completed`);
});
}

View File

@@ -25,7 +25,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 `v4.X.X`, for example `SamKirkland/FTP-Deploy-Action@v4.3.5` (please check the [README](https://github.com/SamKirkland/FTP-Deploy-Action/blob/master/README.md) or the [releases page](https://github.com/SamKirkland/FTP-Deploy-Action/releases/latest) for the latest version).
2. Change the version to `v4.X.X`, for example `SamKirkland/FTP-Deploy-Action@v4.3.6` (please check the [README](https://github.com/SamKirkland/FTP-Deploy-Action/blob/master/README.md) or the [releases page](https://github.com/SamKirkland/FTP-Deploy-Action/releases/latest) for the 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:

9
package-lock.json generated
View File

@@ -10,7 +10,7 @@
"license": "MIT",
"dependencies": {
"@actions/core": "^1.9.1",
"@samkirkland/ftp-deploy": "^1.2.4",
"@samkirkland/ftp-deploy": "^1.2.5",
"@types/jest": "^29.4.1",
"jest": "^29.5.0",
"ts-jest": "^29.0.5",
@@ -1097,9 +1097,10 @@
}
},
"node_modules/@samkirkland/ftp-deploy": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/@samkirkland/ftp-deploy/-/ftp-deploy-1.2.4.tgz",
"integrity": "sha512-MF5BoP1mQS3HBdx2pTMX/sIxSt9S4IgdL6ttrcGpUWC9U/IIPcUnyVEQiiBQJePLXpHI93dT9b8VDoS+cUknNg==",
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/@samkirkland/ftp-deploy/-/ftp-deploy-1.2.5.tgz",
"integrity": "sha512-UZJKpb46FOGLmjgLiQDmzU/3zZUP1ckCaJG6xaHQ1igAGydLm6ctYmQO9gupJYs3HzEYkLXzU5AZGOb4RuHTjw==",
"license": "MIT",
"dependencies": {
"basic-ftp": "^5.0.5",
"lodash": "^4.17.21",

View File

@@ -1,6 +1,6 @@
{
"name": "ftp-deploy-action",
"version": "4.3.5",
"version": "4.3.6",
"private": true,
"description": "Automate deploying websites and more with this GitHub action",
"main": "dist/index.js",
@@ -23,7 +23,7 @@
"license": "MIT",
"dependencies": {
"@actions/core": "^1.9.1",
"@samkirkland/ftp-deploy": "^1.2.4",
"@samkirkland/ftp-deploy": "^1.2.5",
"@types/jest": "^29.4.1",
"jest": "^29.5.0",
"ts-jest": "^29.0.5",