From 601a3cdfc5b7cc2dd5c3ae63829f1333ca7fb23c Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Wed, 8 Sep 2021 23:12:55 +0200 Subject: [PATCH 01/25] fix(pwd): added check for uploaded folder existence --- with_pass.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/with_pass.sh b/with_pass.sh index 8f30ed4..ffe0765 100644 --- a/with_pass.sh +++ b/with_pass.sh @@ -16,4 +16,4 @@ if [ ! -z "$POST_UPLOAD" ]; then echo "βœ… Executed post-upload script"; fi -echo "πŸŽ‰ Done"; \ No newline at end of file +sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} [[ -f $FILE_PATH ]] && echo "πŸŽ‰ Done" || echo "😒 Something went wrong..." && exit 1; \ No newline at end of file From 49294a1b9af6cc4d414e1210395136ae47e959ad Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Wed, 8 Sep 2021 23:26:46 +0200 Subject: [PATCH 02/25] test(act): changed branch to pull with act --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c903d0..e2e4dbb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: marcodallasanta/ssh-scp-deploy@main + - uses: marcodallasanta/ssh-scp-deploy@fix-action_never_fails with: local: "CHANGELOG.md" remote: "~/" From d2658b18121d9d6b4d2d5fdd29476b7d16d1de31 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Wed, 8 Sep 2021 23:41:27 +0200 Subject: [PATCH 03/25] fix(pwd): changed error handling --- with_pass.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/with_pass.sh b/with_pass.sh index ffe0765..86ff182 100644 --- a/with_pass.sh +++ b/with_pass.sh @@ -2,18 +2,21 @@ PRE_UPLOAD=${INPUT_PRE_UPLOAD} if [ ! -z "$PRE_UPLOAD" ]; then echo "πŸ‘Œ Executing pre-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && - echo "βœ… Executed pre-upload script"; + echo "βœ… Executed pre-upload script" || + echo "😒 Something went wrong during pre-upload script" && exit 1; fi echo "🚚 Uploading via scp..." && sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && -echo "πŸ™Œ Uploaded via scp"; +echo "πŸ™Œ Uploaded via scp" || +echo "😒 Something went wrong during upload" && exit 1; POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then echo "πŸ‘Œ Executing post-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && - echo "βœ… Executed post-upload script"; + echo "βœ… Executed post-upload script" || + echo "😒 Something went wrong during post-upload script" && exit 1; fi -sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} [[ -f $FILE_PATH ]] && echo "πŸŽ‰ Done" || echo "😒 Something went wrong..." && exit 1; \ No newline at end of file +echo "πŸŽ‰ Done"; \ No newline at end of file From 00d3f200076ed42743f70eb2d74e72e685873d77 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Wed, 8 Sep 2021 23:45:30 +0200 Subject: [PATCH 04/25] fix(key): changed error handling --- with_key.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/with_key.sh b/with_key.sh index 16201d5..75791e8 100644 --- a/with_key.sh +++ b/with_key.sh @@ -7,18 +7,21 @@ PRE_UPLOAD=${INPUT_PRE_UPLOAD} if [ ! -z "$PRE_UPLOAD" ]; then echo "πŸ‘Œ Executing pre-upload script..." && ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && - echo "βœ… Executed pre-upload script"; + echo "βœ… Executed pre-upload script" || + echo "😒 Something went wrong during pre-upload script" && exit 1; fi echo "🚚 Uploading via scp..." && scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && -echo "πŸ™Œ Uploaded via scp"; +echo "πŸ™Œ Uploaded via scp" || +echo "😒 Something went wrong during upload" && exit 1; POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then echo "πŸ‘Œ Executing post-upload script..." && ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && - echo "βœ… Executed post-upload script"; + echo "βœ… Executed post-upload script" || + echo "😒 Something went wrong during post-upload script" && exit 1; fi echo "πŸŽ‰ Done"; \ No newline at end of file From 8823857dea99473211964fbad59dfbe5765b76d2 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Wed, 8 Sep 2021 23:51:22 +0200 Subject: [PATCH 05/25] test(act): changed branch to pull with act --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2e4dbb..5e28b8c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,8 +12,8 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: marcodallasanta/ssh-scp-deploy@fix-action_never_fails - with: + - uses: marcodallasanta/ssh-scp-deploy@development + with: local: "CHANGELOG.md" remote: "~/" host: ${{secrets.HOST}} From 642835df3dd5c010a7cd966b68085a609dc5066f Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Wed, 8 Sep 2021 23:55:57 +0200 Subject: [PATCH 06/25] fix(CI): spacing on yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5e28b8c..1c7a403 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v1 - uses: marcodallasanta/ssh-scp-deploy@development - with: + with: local: "CHANGELOG.md" remote: "~/" host: ${{secrets.HOST}} From 858fc481b1f65540b0bba3553119d7f262b61e1f Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 00:01:31 +0200 Subject: [PATCH 07/25] test(act): act stopped working on branches? --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c7a403..6c903d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: marcodallasanta/ssh-scp-deploy@development + - uses: marcodallasanta/ssh-scp-deploy@main with: local: "CHANGELOG.md" remote: "~/" From 62e6e5e80a2b06f4546c2ea9574adbea6bca141e Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 00:15:30 +0200 Subject: [PATCH 08/25] test(act): testing CI --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c903d0..1ecacde 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: marcodallasanta/ssh-scp-deploy@main + - uses: marcodallasanta/ssh-scp-deploy@development with: local: "CHANGELOG.md" - remote: "~/" + remote: "${{secrets.REM}}" host: ${{secrets.HOST}} user: ${{secrets.USER}} key: ${{secrets.KEY}} From f254055d3719e0e5d82bcc6fafa0ab46421b96ac Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 00:26:25 +0200 Subject: [PATCH 09/25] fix(key|pass): executing log and exit in same shell but grouped up --- with_key.sh | 6 +++--- with_pass.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/with_key.sh b/with_key.sh index 75791e8..c1ec099 100644 --- a/with_key.sh +++ b/with_key.sh @@ -8,20 +8,20 @@ if [ ! -z "$PRE_UPLOAD" ]; then echo "πŸ‘Œ Executing pre-upload script..." && ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && echo "βœ… Executed pre-upload script" || - echo "😒 Something went wrong during pre-upload script" && exit 1; + {{Β echo "😒 Something went wrong during pre-upload script" && exit 1 }} ; fi echo "🚚 Uploading via scp..." && scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && echo "πŸ™Œ Uploaded via scp" || -echo "😒 Something went wrong during upload" && exit 1; +{{Β echo "😒 Something went wrong during upload" && exit 1 }}; POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then echo "πŸ‘Œ Executing post-upload script..." && ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && echo "βœ… Executed post-upload script" || - echo "😒 Something went wrong during post-upload script" && exit 1; + {{Β echo "😒 Something went wrong during post-upload script" && exit 1 }}; fi echo "πŸŽ‰ Done"; \ No newline at end of file diff --git a/with_pass.sh b/with_pass.sh index 86ff182..7c71569 100644 --- a/with_pass.sh +++ b/with_pass.sh @@ -3,20 +3,20 @@ if [ ! -z "$PRE_UPLOAD" ]; then echo "πŸ‘Œ Executing pre-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && echo "βœ… Executed pre-upload script" || - echo "😒 Something went wrong during pre-upload script" && exit 1; + {{Β echo "😒 Something went wrong during pre-upload script" && exit 1Β }}; fi echo "🚚 Uploading via scp..." && sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && echo "πŸ™Œ Uploaded via scp" || -echo "😒 Something went wrong during upload" && exit 1; +{{ echo "😒 Something went wrong during upload" && exit 1Β }}; POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then echo "πŸ‘Œ Executing post-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && echo "βœ… Executed post-upload script" || - echo "😒 Something went wrong during post-upload script" && exit 1; + {{ echo "😒 Something went wrong during post-upload script" && exit 1 }}; fi echo "πŸŽ‰ Done"; \ No newline at end of file From e700c123e895ebf69283e4e688512ab6a0229d4b Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 00:26:51 +0200 Subject: [PATCH 10/25] test(CI): test workflow error --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ecacde..6c903d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: marcodallasanta/ssh-scp-deploy@development + - uses: marcodallasanta/ssh-scp-deploy@main with: local: "CHANGELOG.md" - remote: "${{secrets.REM}}" + remote: "~/" host: ${{secrets.HOST}} user: ${{secrets.USER}} key: ${{secrets.KEY}} From 11b60a4342c1f1ded4d12ef333f409694d8d83b4 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 00:27:41 +0200 Subject: [PATCH 11/25] test(CI): test workflow error --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c903d0..2904879 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Test on: push: branches: - - main + - development jobs: test: @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: marcodallasanta/ssh-scp-deploy@main + - uses: marcodallasanta/ssh-scp-deploy@development with: local: "CHANGELOG.md" - remote: "~/" + remote: "~/error" host: ${{secrets.HOST}} user: ${{secrets.USER}} key: ${{secrets.KEY}} From 8f67304c1b3c5da4362afddc4cd02c971586b580 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 00:37:02 +0200 Subject: [PATCH 12/25] test(CI): test workflow error --- with_key.sh | 6 +++--- with_pass.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/with_key.sh b/with_key.sh index c1ec099..e9adad1 100644 --- a/with_key.sh +++ b/with_key.sh @@ -8,20 +8,20 @@ if [ ! -z "$PRE_UPLOAD" ]; then echo "πŸ‘Œ Executing pre-upload script..." && ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && echo "βœ… Executed pre-upload script" || - {{Β echo "😒 Something went wrong during pre-upload script" && exit 1 }} ; + {Β echo "😒 Something went wrong during pre-upload script" && exit 1 } ; fi echo "🚚 Uploading via scp..." && scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && echo "πŸ™Œ Uploaded via scp" || -{{Β echo "😒 Something went wrong during upload" && exit 1 }}; +{Β echo "😒 Something went wrong during upload" && exit 1 }; POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then echo "πŸ‘Œ Executing post-upload script..." && ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && echo "βœ… Executed post-upload script" || - {{Β echo "😒 Something went wrong during post-upload script" && exit 1 }}; + {Β echo "😒 Something went wrong during post-upload script" && exit 1 }; fi echo "πŸŽ‰ Done"; \ No newline at end of file diff --git a/with_pass.sh b/with_pass.sh index 7c71569..4d8dbcc 100644 --- a/with_pass.sh +++ b/with_pass.sh @@ -3,20 +3,20 @@ if [ ! -z "$PRE_UPLOAD" ]; then echo "πŸ‘Œ Executing pre-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && echo "βœ… Executed pre-upload script" || - {{Β echo "😒 Something went wrong during pre-upload script" && exit 1Β }}; + {Β echo "😒 Something went wrong during pre-upload script" && exit 1Β }; fi echo "🚚 Uploading via scp..." && sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && echo "πŸ™Œ Uploaded via scp" || -{{ echo "😒 Something went wrong during upload" && exit 1Β }}; +{ echo "😒 Something went wrong during upload" && exit 1Β }; POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then echo "πŸ‘Œ Executing post-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && echo "βœ… Executed post-upload script" || - {{ echo "😒 Something went wrong during post-upload script" && exit 1 }}; + { echo "😒 Something went wrong during post-upload script" && exit 1 }; fi echo "πŸŽ‰ Done"; \ No newline at end of file From c04eabd1e8232981989b1c3b6bd940eeef2fc7a6 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:04:33 +0200 Subject: [PATCH 13/25] fix(key): grouped up commands in same shell --- with_key.sh | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/with_key.sh b/with_key.sh index e9adad1..03c4889 100644 --- a/with_key.sh +++ b/with_key.sh @@ -5,23 +5,32 @@ echo "πŸ” Added ssh key"; PRE_UPLOAD=${INPUT_PRE_UPLOAD} if [ ! -z "$PRE_UPLOAD" ]; then - echo "πŸ‘Œ Executing pre-upload script..." && - ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && - echo "βœ… Executed pre-upload script" || - {Β echo "😒 Something went wrong during pre-upload script" && exit 1 } ; + { + echo "πŸ‘Œ Executing pre-upload script..." && + ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && + echo "βœ… Executed pre-upload script" + } || { + echo "😒 Something went wrong during pre-upload script" && exit 1 + } fi -echo "🚚 Uploading via scp..." && -scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && -echo "πŸ™Œ Uploaded via scp" || -{Β echo "😒 Something went wrong during upload" && exit 1 }; +{ + echo "🚚 Uploading via scp..." && + scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && + echo "πŸ™Œ Uploaded via scp" +} || {Β  + echo "😒 Something went wrong during upload" && exit 1 +} POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then - echo "πŸ‘Œ Executing post-upload script..." && - ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && - echo "βœ… Executed post-upload script" || - {Β echo "😒 Something went wrong during post-upload script" && exit 1 }; + { + echo "πŸ‘Œ Executing post-upload script..." && + ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && + echo "βœ… Executed post-upload script" + } || {Β  + echo "😒 Something went wrong during post-upload script" && exit 1 + } fi echo "πŸŽ‰ Done"; \ No newline at end of file From 3631d6aa3e0dc31a69458eb8e67ad7af074faef2 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:10:30 +0200 Subject: [PATCH 14/25] doc(changelog): update changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca794dd..93debde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ # [Unreleased] +## [v1.0.5] - 2021-09-08 +- [Issue #12](https://github.com/marcodallasanta/ssh-scp-deploy/issues/12) - Action never failed also when file/dir was not uploaded. + ## [v1.0.4] - 2021-02-10 ### Fixed -- Issue #9 - Wrong if on password. +- [Issue #9](https://github.com/marcodallasanta/ssh-scp-deploy/issues/9) - Wrong if on password. ## [v1.0.3] - 2021-02-08 @@ -27,6 +30,7 @@ [unreleased]: https://github.com/marcodallasanta/ssh-scp-deploy/compare/main...development +[v1.0.5]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.5 [v1.0.4]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.4 [v1.0.3]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.3 [v1.0.2]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.2 From c842ff43ead3e721189221b61e03bf2b15d225fc Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:12:09 +0200 Subject: [PATCH 15/25] fix(pass): grouped up commands in same shell --- with_pass.sh | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/with_pass.sh b/with_pass.sh index 4d8dbcc..e6448b0 100644 --- a/with_pass.sh +++ b/with_pass.sh @@ -1,22 +1,31 @@ PRE_UPLOAD=${INPUT_PRE_UPLOAD} if [ ! -z "$PRE_UPLOAD" ]; then - echo "πŸ‘Œ Executing pre-upload script..." && - sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && - echo "βœ… Executed pre-upload script" || - {Β echo "😒 Something went wrong during pre-upload script" && exit 1Β }; + { + echo "πŸ‘Œ Executing pre-upload script..." && + sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && + echo "βœ… Executed pre-upload script" + } || {Β  + echo "😒 Something went wrong during pre-upload script" && exit 1Β  + } fi -echo "🚚 Uploading via scp..." && -sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && -echo "πŸ™Œ Uploaded via scp" || -{ echo "😒 Something went wrong during upload" && exit 1Β }; +{ + echo "🚚 Uploading via scp..." && + sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && + echo "πŸ™Œ Uploaded via scp" +} || { + echo "😒 Something went wrong during upload" && exit 1Β  +} POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then - echo "πŸ‘Œ Executing post-upload script..." && - sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && - echo "βœ… Executed post-upload script" || - { echo "😒 Something went wrong during post-upload script" && exit 1 }; + { + echo "πŸ‘Œ Executing post-upload script..." && + sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && + echo "βœ… Executed post-upload script" + } || { + echo "😒 Something went wrong during post-upload script" && exit 1 + } fi echo "πŸŽ‰ Done"; \ No newline at end of file From 988984a4c2dcc8fbf304385b72e8c0e29174f690 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:20:27 +0200 Subject: [PATCH 16/25] feat(CI): testing either KEY and PASS connection via ssh --- .github/workflows/main.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2904879..2a39758 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: - development jobs: - test: + test-key: runs-on: ubuntu-latest steps: @@ -20,4 +20,20 @@ jobs: user: ${{secrets.USER}} key: ${{secrets.KEY}} pre_upload: echo "pre_upload πŸ‘ˆ" + post_upload: echo "post_upload πŸ‘‰" + + test-pass: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: marcodallasanta/ssh-scp-deploy@development + with: + local: "CHANGELOG.md" + remote: "~/error" + host: ${{secrets.HOST}} + user: ${{secrets.USER}} + password: ${{secrets.PASSWORD}} + pre_upload: echo "pre_upload πŸ‘ˆ" post_upload: echo "post_upload πŸ‘‰" \ No newline at end of file From cb11e978e7864c05a34adad65d0011a31bebf363 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:23:51 +0200 Subject: [PATCH 17/25] fix(CI): missing spacing with pass --- with_pass.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/with_pass.sh b/with_pass.sh index e6448b0..22a951a 100644 --- a/with_pass.sh +++ b/with_pass.sh @@ -4,8 +4,8 @@ if [ ! -z "$PRE_UPLOAD" ]; then echo "πŸ‘Œ Executing pre-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && echo "βœ… Executed pre-upload script" - } || {Β  - echo "😒 Something went wrong during pre-upload script" && exit 1Β  + } || { + echo "😒 Something went wrong during pre-upload script" && exit 1 } fi From 546131ac6dbe3ffe2ae7ef2b0591a9568b2d8d5a Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:28:25 +0200 Subject: [PATCH 18/25] test(CI): this sshpass should fail --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a39758..325e24a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - uses: marcodallasanta/ssh-scp-deploy@development with: local: "CHANGELOG.md" - remote: "~/error" + remote: "~/error/" host: ${{secrets.HOST}} user: ${{secrets.USER}} password: ${{secrets.PASSWORD}} From eee13f37dcb0f6d54e670fa57efb68099e4f5d89 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:29:37 +0200 Subject: [PATCH 19/25] fix(CI): removing test statement --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 325e24a..2b97e31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: - uses: marcodallasanta/ssh-scp-deploy@development with: local: "CHANGELOG.md" - remote: "~/error" + remote: "~/" host: ${{secrets.HOST}} user: ${{secrets.USER}} key: ${{secrets.KEY}} @@ -31,7 +31,7 @@ jobs: - uses: marcodallasanta/ssh-scp-deploy@development with: local: "CHANGELOG.md" - remote: "~/error/" + remote: "~/" host: ${{secrets.HOST}} user: ${{secrets.USER}} password: ${{secrets.PASSWORD}} From bfa5c669b408ff9640cd8c1aaf35c56979033293 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:33:04 +0200 Subject: [PATCH 20/25] test(CI): possible fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b97e31..a7560ce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: - uses: marcodallasanta/ssh-scp-deploy@development with: - local: "CHANGELOG.md" + local: "LICENSE" remote: "~/" host: ${{secrets.HOST}} user: ${{secrets.USER}} From 0f1704d1ab26fcebd446adeda38a0f3dcd50f18c Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:34:49 +0200 Subject: [PATCH 21/25] fix(key): typo --- with_key.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/with_key.sh b/with_key.sh index 03c4889..87a7d41 100644 --- a/with_key.sh +++ b/with_key.sh @@ -16,7 +16,7 @@ fi { echo "🚚 Uploading via scp..." && - scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && + scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && echo "πŸ™Œ Uploaded via scp" } || {Β  echo "😒 Something went wrong during upload" && exit 1 From 6df7204981beacc6b55cdf455a02e4335a675671 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:39:10 +0200 Subject: [PATCH 22/25] fix(key): typo --- with_key.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/with_key.sh b/with_key.sh index 87a7d41..e0207d2 100644 --- a/with_key.sh +++ b/with_key.sh @@ -17,7 +17,7 @@ fi { echo "🚚 Uploading via scp..." && scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && - echo "πŸ™Œ Uploaded via scp" + echo "πŸ™Œ Uploaded via scp" } || {Β  echo "😒 Something went wrong during upload" && exit 1 } From c4514ca69dfa9a146d9217091a9f7df410ba0604 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:41:26 +0200 Subject: [PATCH 23/25] fix(key): fix spacing --- with_key.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/with_key.sh b/with_key.sh index e0207d2..53b557d 100644 --- a/with_key.sh +++ b/with_key.sh @@ -17,9 +17,9 @@ fi { echo "🚚 Uploading via scp..." && scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && - echo "πŸ™Œ Uploaded via scp" -} || {Β  - echo "😒 Something went wrong during upload" && exit 1 + echo "πŸ™Œ Uploaded via scp" +} || { + echo "😒 Something went wrong during upload" && exit 1Β  } POST_UPLOAD=${INPUT_POST_UPLOAD} From 1b7bbc195c05b16c03f7bb2fc1ebbdb9420dcf18 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:43:30 +0200 Subject: [PATCH 24/25] fix(key): spacing --- with_key.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/with_key.sh b/with_key.sh index 53b557d..138b81f 100644 --- a/with_key.sh +++ b/with_key.sh @@ -28,8 +28,8 @@ if [ ! -z "$POST_UPLOAD" ]; then echo "πŸ‘Œ Executing post-upload script..." && ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && echo "βœ… Executed post-upload script" - } || {Β  - echo "😒 Something went wrong during post-upload script" && exit 1 + } || { + echo "😒 Something went wrong during post-upload script" && exit 1 } fi From d4ff23a4b243e3de40b419bbf617fba2145acd58 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Thu, 9 Sep 2021 01:44:42 +0200 Subject: [PATCH 25/25] fix(CI): removed test statements --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7560ce..b4c7a02 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Test on: push: branches: - - development + - main jobs: test-key: @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: marcodallasanta/ssh-scp-deploy@development + - uses: marcodallasanta/ssh-scp-deploy@main with: local: "LICENSE" remote: "~/"