From a540e0316ff327805919d6671cda7df94bf10358 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 09:32:19 +0100 Subject: [PATCH 1/4] installs --- cd-browse-workspace | 1 - cd-init | 5 ++++- cd-synchronize-output | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cd-browse-workspace b/cd-browse-workspace index 817b2b8..b99d6d2 100755 --- a/cd-browse-workspace +++ b/cd-browse-workspace @@ -1,2 +1 @@ -apt-get install 'tree' tree -a "${GITHUB_WORKSPACE}" diff --git a/cd-init b/cd-init index 4e485e7..6b41bc8 100755 --- a/cd-init +++ b/cd-init @@ -1,5 +1,8 @@ -mkdir --parents ~/.ssh +apt-get install --yes \ +'rsync' \ +'tree' \ +mkdir --parents ~/.ssh echo "${CD}" > ~/.ssh/id_ed25519 unset CD chmod 400 ~/.ssh/id_ed25519 diff --git a/cd-synchronize-output b/cd-synchronize-output index 86ca39a..84eeccc 100755 --- a/cd-synchronize-output +++ b/cd-synchronize-output @@ -1,5 +1,3 @@ -apt-get install --yes 'rsync' - rsync \ --archive \ --delete-before \ From 538b1b70fb0b12603f360a64f1851748ae080902 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 09:39:00 +0100 Subject: [PATCH 2/4] ssh,target --- cd-init | 11 ++++++++++- cd-synchronize-output | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cd-init b/cd-init index 6b41bc8..6091431 100755 --- a/cd-init +++ b/cd-init @@ -1,14 +1,23 @@ +export SSH='cd@de.tilde.link' + +export TARGET="${SSH}:/cd/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}" + +# packages + apt-get install --yes \ 'rsync' \ 'tree' \ +# ssh + mkdir --parents ~/.ssh + echo "${CD}" > ~/.ssh/id_ed25519 unset CD chmod 400 ~/.ssh/id_ed25519 ssh \ -o StrictHostKeyChecking=accept-new \ -'cd@de.tilde.link' \ +"${SSH}" \ -- \ hostname diff --git a/cd-synchronize-output b/cd-synchronize-output index 84eeccc..f21fcfd 100755 --- a/cd-synchronize-output +++ b/cd-synchronize-output @@ -3,4 +3,4 @@ rsync \ --delete-before \ --verbose \ 'out/' \ -"cd@de.tilde.link:/cd/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}/" +"${TARGET}/" From 4ac2b666df50a8dc05e74d356e47b4aa81953e3e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 09:52:09 +0100 Subject: [PATCH 3/4] known_hosts --- cd-init | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cd-init b/cd-init index 6091431..79a9a46 100755 --- a/cd-init +++ b/cd-init @@ -1,7 +1,3 @@ -export SSH='cd@de.tilde.link' - -export TARGET="${SSH}:/cd/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}" - # packages apt-get install --yes \ @@ -16,8 +12,14 @@ echo "${CD}" > ~/.ssh/id_ed25519 unset CD chmod 400 ~/.ssh/id_ed25519 -ssh \ --o StrictHostKeyChecking=accept-new \ -"${SSH}" \ --- \ -hostname +echo -n "\ +|1|BcccCTMLpM9HHSgJmPu/FFOwOv0=|+3BKK02xibpCPxQ9Nghi2GbXLng= \ +ssh-ed25519 \ +AAAAC3NzaC1lZDI1NTE5AAAAIPHCNcgHlQoiNTXfnUZYvHz9OZwYsmBCrSSV7a7Zche5 +" > ~/.ssh/known_hosts + +# variables + +export SSH="cd@de.tilde.link" + +export TARGET="${SSH}:/cd/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}" From f6c0709587741a3ca4fe6df3587d43816dcc720a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 10:00:05 +0100 Subject: [PATCH 4/4] user,ssh,target --- cd-init | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cd-init b/cd-init index 79a9a46..373e0cd 100755 --- a/cd-init +++ b/cd-init @@ -20,6 +20,8 @@ AAAAC3NzaC1lZDI1NTE5AAAAIPHCNcgHlQoiNTXfnUZYvHz9OZwYsmBCrSSV7a7Zche5 # variables -export SSH="cd@de.tilde.link" +export USER='cd' -export TARGET="${SSH}:/cd/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}" +export SSH="${USER}@$(basename ${GITHUB_SERVER_URL})" + +export TARGET="${SSH}:/${USER}/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}"