From ed3c0af40ba5a8cf812787e38a781ab6b96e4d4a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 10:14:22 +0100 Subject: [PATCH 1/5] debug --- cd-synchronize-output | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cd-synchronize-output b/cd-synchronize-output index 7040829..99d2b17 100755 --- a/cd-synchronize-output +++ b/cd-synchronize-output @@ -1,6 +1,6 @@ -rsync \ ---archive \ ---delete-before \ ---verbose \ -'out/' \ -"${SSH_URL}/" +#rsync \ +#--archive \ +#--delete-before \ +#--verbose \ +#'out/' \ +echo "${SSH_URL}/" From 52a7cd1d44eed60b82caf960a7d58dafeb67c827 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 10:18:10 +0100 Subject: [PATCH 2/5] debug --- cd-init | 1 + 1 file changed, 1 insertion(+) diff --git a/cd-init b/cd-init index 055622d..03f06f6 100755 --- a/cd-init +++ b/cd-init @@ -27,3 +27,4 @@ ${SSH_ID}@$(basename ${GITHUB_SERVER_URL})\ :\ /${SSH_ID}/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}\ " +echo "${SSH_URL}" From b7ab5a1f30da01ea7da66836b1b58b7ad5e34541 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 12:10:20 +0100 Subject: [PATCH 3/5] python3 --- cd-init | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/cd-init b/cd-init index 03f06f6..85c1259 100755 --- a/cd-init +++ b/cd-init @@ -1,9 +1,3 @@ -# packages - -apt-get install --yes \ -'rsync' \ -'tree' \ - # ssh mkdir --parents ~/.ssh @@ -18,13 +12,9 @@ ssh-ed25519 \ AAAAC3NzaC1lZDI1NTE5AAAAIPHCNcgHlQoiNTXfnUZYvHz9OZwYsmBCrSSV7a7Zche5 " > ~/.ssh/known_hosts -# variables +# packages -export SSH_ID='cd' - -export SSH_URL="\ -${SSH_ID}@$(basename ${GITHUB_SERVER_URL})\ -:\ -/${SSH_ID}/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}\ -" -echo "${SSH_URL}" +apt-get install --yes \ +'python3' \ +'rsync' \ +'tree' \ From d7d3aeee39b2742736b5418482443d7d1748ea07 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 12:20:52 +0100 Subject: [PATCH 4/5] sync/debug --- cd-synchronize-output | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/cd-synchronize-output b/cd-synchronize-output index 99d2b17..4fec4ed 100755 --- a/cd-synchronize-output +++ b/cd-synchronize-output @@ -1,6 +1,19 @@ +[ "${1}" ] || exit + +SYNC_HOST="$(basename ${GITHUB_SERVER_URL})" +SYNC_SOURCE="${1}" +SYNC_USER='cd' + +SYNC_ROOT="/${SYNC_USER}/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}" + +SYNC_TARGET="${SYNC_USER}@${SYNC_HOST}:${SYNC_ROOT}" +if [ "${2}" ] ; then + SYNC_TARGET="${SYNC_TARGET}/${2}" +fi + #rsync \ #--archive \ #--delete-before \ #--verbose \ -#'out/' \ -echo "${SSH_URL}/" +echo "${SYNC_SOURCE}/" +echo "${SYNC_TARGET}/" From c5be132b42456fe35a584b14b8192a05a02c4b30 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 13:07:20 +0100 Subject: [PATCH 5/5] sync/checks --- cd-synchronize-output | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/cd-synchronize-output b/cd-synchronize-output index 4fec4ed..0f975ba 100755 --- a/cd-synchronize-output +++ b/cd-synchronize-output @@ -1,15 +1,19 @@ -[ "${1}" ] || exit +[ "${1}" ] && SYNC_SOURCE="${1}" || exit -SYNC_HOST="$(basename ${GITHUB_SERVER_URL})" -SYNC_SOURCE="${1}" SYNC_USER='cd' -SYNC_ROOT="/${SYNC_USER}/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}" +[ "${GITHUB_SERVER_URL}" ] \ +&& SYNC_HOST="$(basename ${GITHUB_SERVER_URL})" || exit + +[ "${SYNC_USER}" ] \ +&& SYNC_ROOT="/${SYNC_USER}" || exit +[ "${GITHUB_REF_NAME}" ] \ +&& SYNC_ROOT="${SYNC_ROOT}/${GITHUB_REF_NAME}" || exit +[ "${GITHUB_REPOSITORY}" ] \ +&& SYNC_ROOT="${SYNC_ROOT}/${GITHUB_REPOSITORY}" || exit SYNC_TARGET="${SYNC_USER}@${SYNC_HOST}:${SYNC_ROOT}" -if [ "${2}" ] ; then - SYNC_TARGET="${SYNC_TARGET}/${2}" -fi +[ "${2}" ] && SYNC_TARGET="${SYNC_TARGET}/${2}" #rsync \ #--archive \