From c7a9a8f2ab0e3bbc8e9e4402595b68693fab67f0 Mon Sep 17 00:00:00 2001 From: Annika Backstrom Date: Sun, 19 May 2024 00:17:50 +0100 Subject: [PATCH] Revert to positional arguments --- action.yml | 4 ++++ entrypoint.sh | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index af331ed..9b278b4 100644 --- a/action.yml +++ b/action.yml @@ -16,6 +16,10 @@ inputs: runs: using: 'docker' image: 'Dockerfile' + args: + - ${{ inputs.local_path }} + - ${{ inputs.deploy_path }} + - ${{ inputs.restart_nginx }} env: INPUT_LOCAL_PATH: ${{ inputs.local_path }} INPUT_DEPLOY_PATH: ${{ inputs.deploy_path }} diff --git a/entrypoint.sh b/entrypoint.sh index c292f2a..406f4e9 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,11 +1,15 @@ #!/bin/sh -l +LOCAL_PATH="$1" +DEPLOY_PATH="$2" +RESTART_NGINX="$3" + env -rsync -hrz --delete -C --exclude=".*" -e ssh "$INPUT_LOCAL_PATH" "deploy.sixohthree.com:/tmp/gitea_${GITHUB_RUN_NUMBER}_${GITHUB_SHA}" -ssh deploy.sixohthree.com "dsh -M -c -r ssh -g webs -- rsync -hvrz --delete -C -e ssh deploy.sixohthree.com:/tmp/gitea_${GITHUB_RUN_NUMBER}_${GITHUB_SHA}/ $INPUT_DEPLOY_PATH" +rsync -hrz --delete -C --exclude=".*" -e ssh "$LOCAL_PATH" "deploy.sixohthree.com:/tmp/gitea_${GITHUB_RUN_NUMBER}_${GITHUB_SHA}" +ssh deploy.sixohthree.com "dsh -M -c -r ssh -g webs -- rsync -hvrz --delete -C -e ssh deploy.sixohthree.com:/tmp/gitea_${GITHUB_RUN_NUMBER}_${GITHUB_SHA}/ $DEPLOY_PATH" ssh deploy.sixohthree.com "rm -rf /tmp/gitea_${GITHUB_RUN_NUMBER}_${GITHUB_SHA}" -if [ "$INPUT_RESTART_NGINX" ]; then +if [ "$RESTART_NGINX" = "1"]; then ssh deploy.sixohthree.com "dsh -M -c -r ssh -g webs -- sudo systemctl reload nginx" fi