From 0f888d1f0937021519f511f2aca361f70cf4dd7b Mon Sep 17 00:00:00 2001 From: ZAbas <82032822+ZabasJC@users.noreply.github.com> Date: Tue, 22 Nov 2022 23:14:36 +0100 Subject: [PATCH 1/4] added if statement for S3_PREFIX --- index.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index fa783dc..2dbc355 100644 --- a/index.js +++ b/index.js @@ -18,11 +18,21 @@ const uploadFile = (fileName) => { const fileContent = fs.readFileSync(fileName); // Setting up S3 upload parameters - const params = { - Bucket: process.env.S3_BUCKET, - Key: `${process.env.S3_PREFIX || ""}/${path.normalize(fileName)}`, - Body: fileContent, - }; + + if (S3_PREFIX == '') { + var params = { + Bucket: process.env.S3_BUCKET, + Key: `${path.normalize(fileName)}`, + Body: fileContent, + }; + } else { + var params = { + Bucket: process.env.S3_BUCKET, + Key: `${process.env.S3_PREFIX || ""}/${path.normalize(fileName)}`, + Body: fileContent, + }; + } + const acl = process.env.S3_ACL; if (acl) { params.ACL = acl; From a43924f32e821d477ef656526f2c1993a9c05599 Mon Sep 17 00:00:00 2001 From: ZAbas <82032822+ZabasJC@users.noreply.github.com> Date: Tue, 22 Nov 2022 23:18:07 +0100 Subject: [PATCH 2/4] fixed env param --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 2dbc355..1556369 100644 --- a/index.js +++ b/index.js @@ -19,7 +19,7 @@ const uploadFile = (fileName) => { // Setting up S3 upload parameters - if (S3_PREFIX == '') { + if (process.env.S3_PREFIX == '') { var params = { Bucket: process.env.S3_BUCKET, Key: `${path.normalize(fileName)}`, From f8c8a9ca394b30367709cf45897a26b34e423d01 Mon Sep 17 00:00:00 2001 From: ZAbas <82032822+ZabasJC@users.noreply.github.com> Date: Tue, 22 Nov 2022 23:31:50 +0100 Subject: [PATCH 3/4] added foreach --- index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 1556369..1e261a5 100644 --- a/index.js +++ b/index.js @@ -48,4 +48,7 @@ const uploadFile = (fileName) => { } }; -uploadFile(process.env.FILE); +const array = (process.env.FILE).split(" "); +array.forEach((file) => { + uploadFile(file); +}) From c977cbf001224ec8274c196c0ef00467a44b46ef Mon Sep 17 00:00:00 2001 From: ZAbas <82032822+ZabasJC@users.noreply.github.com> Date: Tue, 22 Nov 2022 23:37:46 +0100 Subject: [PATCH 4/4] readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0df7e55..bab5dc5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +EDITED by ZabasJC + # s3-upload-github-action S3 uploader for Github Actions. @@ -23,7 +25,8 @@ jobs: - name: Upload file to bucket uses: koraykoska/s3-upload-github-action@master env: - FILE: ./releases/ + FILE: ./releases/ # can handle a list of files divided by space + S3_PREFIX: 'whatever' # if blank, it will be skipped S3_ENDPOINT: 'ams3.digitaloceanspaces.com' S3_BUCKET: ${{ secrets.S3_BUCKET }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}