From dea54c2c761565dd57242f010ffd8969b0a67e06 Mon Sep 17 00:00:00 2001 From: Ludger Sicking Date: Tue, 3 Dec 2024 08:53:55 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Deployment:=20Syntax=20f=C3=BCr=20"steps"?= =?UTF-8?q?=20erproben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/build_and_copy_blog.yaml | 42 +++++++--------------------- archiv/eine-deployment-datei | 3 ++ 2 files changed, 13 insertions(+), 32 deletions(-) create mode 100644 archiv/eine-deployment-datei diff --git a/.woodpecker/build_and_copy_blog.yaml b/.woodpecker/build_and_copy_blog.yaml index e201798..cd921ca 100644 --- a/.woodpecker/build_and_copy_blog.yaml +++ b/.woodpecker/build_and_copy_blog.yaml @@ -1,23 +1,16 @@ +when: ++ branch: feature/* + - event: push + - path: + include: ['archiv/**'] + on_empty: false + steps: - - - name: set_path_for_branch - image: alpine - commands: - - echo 'Schritt.01. set_path_for_branch' - - echo "PATH_FOR_BRANCH=$CI_COMMIT_BRANCH" >> environment_variables - - cat environment_variables - - sed "s+'//oer.community/'+'//oer.community/sb/${CI_COMMIT_BRANCH}/'+" sb/hugo.yaml > hugo-changed.yaml - - cat sb/hugo.yaml - - cat hugo-changed.yaml - - mv hugo-changed.yaml sb/hugo.yaml - - find . -name "*hugo*ml" - - name: build_by_hugo image: hugomods/hugo commands: - hugo version - - git -C sb/themes/ submodule update --remote --recursive - - hugo --cleanDestinationDir -s sb --logLevel info + - hugo -s sb --logLevel info - name: copy_to_server image: alpine @@ -34,26 +27,11 @@ steps: from_secret: target_path commands: - - BLOG_FOLDER=$TARGET_PATH/sb/${CI_COMMIT_BRANCH} - - echo $BLOG_FOLDER - - apk add --no-cache openssh - mkdir -p ~/.ssh - echo "$SSH_KEY" | tr -d '\r' > ~/.ssh/deployKey - chmod 600 ~/.ssh/deployKey - ssh-keyscan -H -p $SSH_PORT $SSH_HOST 2>/dev/null >> ~/.ssh/known_hosts - chmod 600 ~/.ssh/known_hosts - - - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST "mkdir -p $BLOG_FOLDER" - - - SSH_COMMAND="touch $BLOG_FOLDER/touchdown-txt_dot-log" - - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST $SSH_COMMAND - - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST 'ls -la' - - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST "ls -la $BLOG_FOLDER" - - - SSH_COMMAND="mkdir -p "$BLOG_FOLDER/_unter_ordner; touch $BLOG_FOLDER/_unter_ordner/_eine_datei" - - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST $SSH_COMMAND - - - SSH_COMMAND="rmdir -p "$BLOG_FOLDER/_unter_ordner" - - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST $SSH_COMMAND - + - scp -r -i ~/.ssh/deployKey -P $SSH_PORT sb/public/* $SSH_USER@$SSH_HOST:$TARGET_PATH/ + - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST 'touch $HOME/time_$(date +"%Y-%m-%d_%T_%N")' \ No newline at end of file diff --git a/archiv/eine-deployment-datei b/archiv/eine-deployment-datei new file mode 100644 index 0000000..89e0d37 --- /dev/null +++ b/archiv/eine-deployment-datei @@ -0,0 +1,3 @@ +In dieser Datei wird sich - +abhängig vom Deployment Schritt - +mal mehr, mal weniger ändern. \ No newline at end of file From bdb58a63c051226489fb82e14fb23f8d97fbe20c Mon Sep 17 00:00:00 2001 From: Ludger Sicking Date: Tue, 3 Dec 2024 08:56:20 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Deployment:=20Syntax=20f=C3=BCr=20"steps"?= =?UTF-8?q?=20erproben=20001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/build_and_copy_blog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build_and_copy_blog.yaml b/.woodpecker/build_and_copy_blog.yaml index cd921ca..68499fc 100644 --- a/.woodpecker/build_and_copy_blog.yaml +++ b/.woodpecker/build_and_copy_blog.yaml @@ -1,5 +1,5 @@ when: -+ branch: feature/* + - branch: feature/* - event: push - path: include: ['archiv/**'] From cd6a90ff10ec3262cebe12b3f83c7d466400cbcf Mon Sep 17 00:00:00 2001 From: Ludger Sicking Date: Tue, 3 Dec 2024 09:00:48 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Deployment:=20Syntax=20f=C3=BCr=20"steps"?= =?UTF-8?q?=20erproben=20002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/build_and_copy_blog.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build_and_copy_blog.yaml b/.woodpecker/build_and_copy_blog.yaml index 68499fc..77d26f4 100644 --- a/.woodpecker/build_and_copy_blog.yaml +++ b/.woodpecker/build_and_copy_blog.yaml @@ -1,7 +1,7 @@ when: - branch: feature/* - - event: push - - path: + event: push + path: include: ['archiv/**'] on_empty: false From 43046f2dc6c501bcd6545bf77e6ded7c982c32c1 Mon Sep 17 00:00:00 2001 From: Ludger Sicking Date: Tue, 3 Dec 2024 09:02:29 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Deployment:=20Syntax=20f=C3=BCr=20"steps"?= =?UTF-8?q?=20erproben=20003?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archiv/eine-deployment-datei | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/archiv/eine-deployment-datei b/archiv/eine-deployment-datei index 89e0d37..94c3c54 100644 --- a/archiv/eine-deployment-datei +++ b/archiv/eine-deployment-datei @@ -1,3 +1,5 @@ In dieser Datei wird sich - abhängig vom Deployment Schritt - -mal mehr, mal weniger ändern. \ No newline at end of file +mal mehr, mal weniger ändern. + +Vielleicht läuft der Build Step nun. \ No newline at end of file From 2e645d65f5b9a0b75397e3f1adfa88f273eff91e Mon Sep 17 00:00:00 2001 From: Ludger Sicking Date: Tue, 3 Dec 2024 09:13:24 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Deployment:=20Syntax=20f=C3=BCr=20"steps"?= =?UTF-8?q?=20erproben=20004?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/build_and_copy_blog.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build_and_copy_blog.yaml b/.woodpecker/build_and_copy_blog.yaml index 77d26f4..931c2c6 100644 --- a/.woodpecker/build_and_copy_blog.yaml +++ b/.woodpecker/build_and_copy_blog.yaml @@ -1,8 +1,8 @@ when: - - branch: feature/* + - branch: main event: push path: - include: ['archiv/**'] + include: ['sb/**'] on_empty: false steps: