From b325dca13b1479c669e4f586949305977fb93323 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 22 Mar 2024 23:15:17 +0100 Subject: [PATCH 01/19] env --- .forgejo/workflows/main.yaml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 39c0653..1d9ed3f 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -5,24 +5,18 @@ jobs: container: image: debian:bookworm steps: - - name: Sort environment - run: env | sort - - - name: List event - run: cat "${GITHUB_EVENT_PATH}" - - - name: Set DNS + - name: Clone CD run: | echo '${{vars.dns}}' > '/etc/resolv.conf' - cat '/etc/resolv.conf' + apt-get update + apt-get install --yes 'git' + git clone "${GITHUB_SERVER_URL}/rwx.work/cd" - - name: Update catalog - run: apt-get update + - run: 'cd/env' - name: Install tools run: | - apt-get install --assume-yes \ - 'git' \ + apt-get install --yes \ 'tree' \ 'pandoc' \ 'rsync' \ From c1c823806155c90e6cebbfbdca7c0e3a28ead1ca Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 22 Mar 2024 23:21:46 +0100 Subject: [PATCH 02/19] workspace --- .forgejo/workflows/main.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 1d9ed3f..cfbe288 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -14,19 +14,17 @@ jobs: - run: 'cd/env' + - run: 'cd/workspace' + - name: Install tools run: | apt-get install --yes \ - 'tree' \ 'pandoc' \ 'rsync' \ - name: Clone repository run: git clone "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" '.' - - name: Browse workspace - run: tree -a "${GITHUB_WORKSPACE}" - - name: Build run: './build.sh' From 0ed9a7691f3e8661736fcc13c4acb5802668773c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 22 Mar 2024 23:29:34 +0100 Subject: [PATCH 03/19] /cd --- .forgejo/workflows/main.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index cfbe288..3cf1210 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -10,11 +10,11 @@ jobs: echo '${{vars.dns}}' > '/etc/resolv.conf' apt-get update apt-get install --yes 'git' - git clone "${GITHUB_SERVER_URL}/rwx.work/cd" + git clone "${GITHUB_SERVER_URL}/rwx.work/cd" '/cd' - - run: 'cd/env' + - run: '/cd/env' - - run: 'cd/workspace' + - run: '/cd/workspace' - name: Install tools run: | From 34b3ecd0b9749f28c01b3ad4f05c7de4ea04c34c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 22 Mar 2024 23:38:49 +0100 Subject: [PATCH 04/19] branch --- .forgejo/workflows/main.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 3cf1210..0036c99 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -12,9 +12,9 @@ jobs: apt-get install --yes 'git' git clone "${GITHUB_SERVER_URL}/rwx.work/cd" '/cd' - - run: '/cd/env' + - run: /cd/env - - run: '/cd/workspace' + - run: /cd/workspace - name: Install tools run: | @@ -22,8 +22,7 @@ jobs: 'pandoc' \ 'rsync' \ - - name: Clone repository - run: git clone "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" '.' + - run: /cd/branch - name: Build run: './build.sh' From bdfadec91a5bbd6ce331271e448dbdedf93ef3ce Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 22 Mar 2024 23:49:57 +0100 Subject: [PATCH 05/19] sync --- .forgejo/workflows/main.yaml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 0036c99..137511a 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -20,29 +20,10 @@ jobs: run: | apt-get install --yes \ 'pandoc' \ - 'rsync' \ - run: /cd/branch - name: Build run: './build.sh' - - name: Configure Delivery - run: | - mkdir --parents ~/.ssh - echo '${{secrets.cd}}' > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - sha256sum ~/.ssh/id_ed25519 - - - name: Test connection - run: | - ssh -o StrictHostKeyChecking=accept-new 'cd@de.tilde.link' \ - -- hostname - - - name: Synchronize output - run: | - rsync \ - --archive \ - --verbose \ - 'out/' \ - "cd@de.tilde.link:/cd/${GITHUB_REF_NAME}/${GITHUB_REPOSITORY}/" + - run: /cd/sync From 576bc2047583c84fca0fa86d943a2622994a5d68 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 22 Mar 2024 23:59:29 +0100 Subject: [PATCH 06/19] build --- .forgejo/workflows/main.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 137511a..5b1c949 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -14,16 +14,15 @@ jobs: - run: /cd/env - - run: /cd/workspace - - name: Install tools run: | apt-get install --yes \ 'pandoc' \ - run: /cd/branch - - - name: Build - run: './build.sh' - + - run: /cd/build + - run: /cd/workspace - run: /cd/sync + + - run: echo "${PATH}" + - run: ls -al /usr/local/bin From 773995a3d5f3c954bdaa1ed6b1f5b87a23bac0d0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 00:06:37 +0100 Subject: [PATCH 07/19] swap --- .forgejo/workflows/main.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 5b1c949..a73aee2 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -14,6 +14,8 @@ jobs: - run: /cd/env + - run: echo "${PATH}" + - run: ls -al /usr/local/bin - name: Install tools run: | apt-get install --yes \ @@ -23,6 +25,3 @@ jobs: - run: /cd/build - run: /cd/workspace - run: /cd/sync - - - run: echo "${PATH}" - - run: ls -al /usr/local/bin From a821a68e71e7d9c78058c0cbda3eaa0abb6abf28 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 00:14:48 +0100 Subject: [PATCH 08/19] cd- --- .forgejo/workflows/main.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index a73aee2..920f47b 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -10,18 +10,17 @@ jobs: echo '${{vars.dns}}' > '/etc/resolv.conf' apt-get update apt-get install --yes 'git' - git clone "${GITHUB_SERVER_URL}/rwx.work/cd" '/cd' + git clone "${GITHUB_SERVER_URL}/rwx.work/cd" '/usr/local/bin' - - run: /cd/env + - run: cd-list-environment - - run: echo "${PATH}" - - run: ls -al /usr/local/bin + - run: ls -al /usr/local/sbin - name: Install tools run: | apt-get install --yes \ 'pandoc' \ - - run: /cd/branch - - run: /cd/build - - run: /cd/workspace - - run: /cd/sync + - run: cd-clone-branch + - run: cd-build + - run: cd-browse-workspace + - run: cd-synchronize-output From ab09acce8531af9398c3adf44edfcb4c660619ab Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 00:17:31 +0100 Subject: [PATCH 09/19] sbin --- .forgejo/workflows/main.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 920f47b..1b32708 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -10,11 +10,10 @@ jobs: echo '${{vars.dns}}' > '/etc/resolv.conf' apt-get update apt-get install --yes 'git' - git clone "${GITHUB_SERVER_URL}/rwx.work/cd" '/usr/local/bin' + git clone "${GITHUB_SERVER_URL}/rwx.work/cd" '/usr/local/sbin' - run: cd-list-environment - - run: ls -al /usr/local/sbin - name: Install tools run: | apt-get install --yes \ From 8e1f0167af94b8bd9605e49dd9d7f1fc307f6017 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 00:26:07 +0100 Subject: [PATCH 10/19] top --- .forgejo/workflows/main.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 1b32708..fa3938c 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -12,6 +12,8 @@ jobs: apt-get install --yes 'git' git clone "${GITHUB_SERVER_URL}/rwx.work/cd" '/usr/local/sbin' + - env: + TOP_SECRET: ${{secrets.top_secret}} - run: cd-list-environment - name: Install tools From ba891ee0aa3306cad6feb12d3677f0355168e72c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 00:31:27 +0100 Subject: [PATCH 11/19] sectop --- .forgejo/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index fa3938c..e424960 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -14,7 +14,7 @@ jobs: - env: TOP_SECRET: ${{secrets.top_secret}} - - run: cd-list-environment + run: cd-list-environment - name: Install tools run: | From 370fba0b217afd76ab6a5d1e5571c00323d0ec10 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 00:39:53 +0100 Subject: [PATCH 12/19] eval --- .forgejo/workflows/main.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index e424960..dcefd45 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -8,13 +8,9 @@ jobs: - name: Clone CD run: | echo '${{vars.dns}}' > '/etc/resolv.conf' - apt-get update - apt-get install --yes 'git' - git clone "${GITHUB_SERVER_URL}/rwx.work/cd" '/usr/local/sbin' + eval "${{vars.cd}}" - - env: - TOP_SECRET: ${{secrets.top_secret}} - run: cd-list-environment + - run: cd-list-environment - name: Install tools run: | From 1b44baeba4a970545ef50654edd386cd125165bf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 00:47:45 +0100 Subject: [PATCH 13/19] dns --- .forgejo/workflows/main.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index dcefd45..850c008 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -5,10 +5,8 @@ jobs: container: image: debian:bookworm steps: - - name: Clone CD - run: | - echo '${{vars.dns}}' > '/etc/resolv.conf' - eval "${{vars.cd}}" + - name: cd + run: eval "${{vars.cd}}" - run: cd-list-environment From 58e5aa63580e1c14c538aec9ce8aa4d64ad647d2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 01:03:40 +0100 Subject: [PATCH 14/19] ssh --- .forgejo/workflows/main.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 850c008..7d80c9e 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -1,12 +1,19 @@ on: [push] jobs: job: + runs-on: docker container: image: debian:bookworm + steps: + - name: cd - run: eval "${{vars.cd}}" + run: eval '${{vars.cd}}' + + - env: + CD: '${{secrets.cd}}' + run: cd-set-ssh - run: cd-list-environment From d84b4606adf032b2c762ab79069e6a2ba7a42243 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 01:19:52 +0100 Subject: [PATCH 15/19] init --- .forgejo/workflows/main.yaml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 7d80c9e..7b5073d 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -9,20 +9,17 @@ jobs: steps: - name: cd - run: eval '${{vars.cd}}' - - - env: + env: CD: '${{secrets.cd}}' - run: cd-set-ssh - + run: | + eval '${{vars.cd}}' + cd-init - run: cd-list-environment - - name: Install tools - run: | - apt-get install --yes \ - 'pandoc' \ - - run: cd-clone-branch - - run: cd-build + - run: cd-install 'pandoc' + + - run: cd-build-project - run: cd-browse-workspace + - run: cd-synchronize-output From e8eef343063dfbf5e17c7c120fb91299470f8940 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 01:22:16 +0100 Subject: [PATCH 16/19] packages --- .forgejo/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 7b5073d..c8ab8d5 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -17,7 +17,7 @@ jobs: - run: cd-list-environment - run: cd-clone-branch - - run: cd-install 'pandoc' + - run: cd-install-packages 'pandoc' - run: cd-build-project - run: cd-browse-workspace From 05dbdbbd088b00fcc2d09b6a2fd44ba5af6b4955 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 01:39:44 +0100 Subject: [PATCH 17/19] cd-init --- .forgejo/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index c8ab8d5..7dce0e7 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -8,7 +8,7 @@ jobs: steps: - - name: cd + - name: cd-init env: CD: '${{secrets.cd}}' run: | From 73ddb411d71c169a7e284a3a708227938ae465a0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 12:24:22 +0100 Subject: [PATCH 18/19] out --- .forgejo/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 7dce0e7..fa9f48e 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -22,4 +22,4 @@ jobs: - run: cd-build-project - run: cd-browse-workspace - - run: cd-synchronize-output + - run: cd-synchronize-output 'out' From d1a181679334cff07c792a6b6130e37efcb66ac2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 23 Mar 2024 13:43:35 +0100 Subject: [PATCH 19/19] cd-bootstrap --- .forgejo/workflows/main.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index fa9f48e..91ae6cc 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -8,12 +8,11 @@ jobs: steps: - - name: cd-init + - name: cd-bootstrap env: CD: '${{secrets.cd}}' - run: | - eval '${{vars.cd}}' - cd-init + run: eval '${{vars.cd}}' + - run: cd-list-environment - run: cd-clone-branch