From f98fbc353830e368b28b2720b7dd36c708709a20 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 12:14:16 +0200 Subject: [PATCH 01/10] +ssh/key --- .forgejo/workflows/main.yaml | 1 + .github/workflows/main.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index fd1bcd0..ac12181 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -9,6 +9,7 @@ jobs: SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} + SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} run: ${{vars.SPCD}} - run: spcd-list-environment diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 337fc88..16e2749 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -10,6 +10,7 @@ jobs: SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} + SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} run: echo '${{vars.SPCD}}' | tr -d '\r' | sh -s - run: spcd-list-environment From 5c6add201c5f7613c7885efd83901810990d5c51 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 14:38:54 +0200 Subject: [PATCH 02/10] tilde.link --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 3f1c37d..38c1b90 100644 --- a/readme.md +++ b/readme.md @@ -16,6 +16,7 @@ Sample project, demonstrating the use of \ * [forgejo @ forge.rwx.work / beninca.link](https://forge.rwx.work/org/beninca.link/settings/actions/variables) * [forgejo @ forge.rwx.work / rwx.work](https://forge.rwx.work/org/rwx.work/settings/actions/variables) +* [forgejo @ forge.rwx.work / tilde.link](https://forge.rwx.work/org/tilde.link/settings/actions/variables) * [gitea @ git.projectsegfau.lt / rwx.work](https://git.projectsegfau.lt/org/rwx.work/settings/actions/variables) * [github @ github.com / rwx-work](https://github.com/organizations/rwx-work/settings/variables/actions) * [gitlab @ gitlab.com / rwx.work](https://gitlab.com/groups/rwx.work/-/settings/ci_cd) From 9033afb30e610ae53af6d4909b3f9fd470a4af58 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 15:38:47 +0200 Subject: [PATCH 03/10] fixes --- .forgejo/workflows/main.yaml | 1 - .github/workflows/main.yaml | 2 -- .gitlab-ci.yml | 1 - 3 files changed, 4 deletions(-) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index ac12181..2c9264c 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -12,7 +12,6 @@ jobs: SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} run: ${{vars.SPCD}} - - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace - run: spcd-synchronize diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 16e2749..3842603 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -13,7 +13,5 @@ jobs: SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} run: echo '${{vars.SPCD}}' | tr -d '\r' | sh -s - - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace - - run: spcd-synchronize diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 859dff8..5db3efa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,5 @@ job: script: - sh ${SPCD} - - spcd-list-environment - spcd-build-project - spcd-browse-workspace From a28beb11b647854d2c8bdb85d01cb0adbae1444e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 15:59:00 +0200 Subject: [PATCH 04/10] fixes --- .forgejo/workflows/main.yaml | 2 -- .gitea | 1 - .gitea/workflows/main.yaml | 14 ++++++++++++++ .github/workflows/main.yaml | 2 -- 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 120000 .gitea create mode 100644 .gitea/workflows/main.yaml diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 2c9264c..1e27586 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -6,8 +6,6 @@ jobs: steps: - name: spcd env: - SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} - SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} run: ${{vars.SPCD}} diff --git a/.gitea b/.gitea deleted file mode 120000 index d9a4b42..0000000 --- a/.gitea +++ /dev/null @@ -1 +0,0 @@ -.forgejo \ No newline at end of file diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml new file mode 100644 index 0000000..43ea82b --- /dev/null +++ b/.gitea/workflows/main.yaml @@ -0,0 +1,14 @@ +on: [push] +jobs: + job: + container: + image: ${{vars.DOCKER}}debian:bookworm + steps: + - name: spcd + env: + SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} + SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} + run: ${{vars.SPCD}} + + - run: spcd-build-project + - run: spcd-browse-workspace diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 3842603..f265520 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,8 +9,6 @@ jobs: env: SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} - SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} - SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} run: echo '${{vars.SPCD}}' | tr -d '\r' | sh -s - run: spcd-build-project From cfd946e27d9ead27947fe7267ee1c6da45a9619e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 17:33:13 +0200 Subject: [PATCH 05/10] spcd --- .forgejo/workflows/main.yaml | 1 + .gitea/workflows/main.yaml | 1 + .github/workflows/main.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 1e27586..2cdb6a2 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -6,6 +6,7 @@ jobs: steps: - name: spcd env: + SPCD: ${{vars.SPCD}} SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} run: ${{vars.SPCD}} diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 43ea82b..4733f41 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -6,6 +6,7 @@ jobs: steps: - name: spcd env: + SPCD: ${{vars.SPCD}} SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} run: ${{vars.SPCD}} diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f265520..fbed418 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -7,6 +7,7 @@ jobs: steps: - name: spcd env: + SPCD: ${{vars.SPCD}} SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} run: echo '${{vars.SPCD}}' | tr -d '\r' | sh -s From 639ff63b9ea07b4fa158ff784c73913de18ce082 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 20:02:18 +0200 Subject: [PATCH 06/10] =?UTF-8?q?gitlab/=E2=88=92sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5db3efa..209cf72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: ${DOCKER}debian:bookworm job: script: - - sh ${SPCD} + - ${SPCD} - spcd-build-project - spcd-browse-workspace From b8ddf851522a9d01df095885ca6b1393f083e070 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 20:05:19 +0200 Subject: [PATCH 07/10] gitlab/echo|sh --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 209cf72..aeea05f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: ${DOCKER}debian:bookworm job: script: - - ${SPCD} + - echo ${SPCD} | sh -s - spcd-build-project - spcd-browse-workspace From 640cc03395f718ae31c27dd0ab2c47afa96a6915 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 20:07:47 +0200 Subject: [PATCH 08/10] gitlab/"" --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aeea05f..7ff26d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: ${DOCKER}debian:bookworm job: script: - - echo ${SPCD} | sh -s + - echo "${SPCD}" | sh -s - spcd-build-project - spcd-browse-workspace From b6f70cf3c1c828e7760cefb895783aa262cf0392 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 21:53:59 +0200 Subject: [PATCH 09/10] github/"" --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index fbed418..1446eb5 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -10,7 +10,7 @@ jobs: SPCD: ${{vars.SPCD}} SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} - run: echo '${{vars.SPCD}}' | tr -d '\r' | sh -s + run: echo "${{vars.SPCD}}" | tr -d '\r' | sh -s - run: spcd-build-project - run: spcd-browse-workspace From a6cbf0bb0562cd917211d1282075879793b8c191 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 29 Jul 2024 21:55:25 +0200 Subject: [PATCH 10/10] github/"" --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1446eb5..2558b3b 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -10,7 +10,7 @@ jobs: SPCD: ${{vars.SPCD}} SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} - run: echo "${{vars.SPCD}}" | tr -d '\r' | sh -s + run: echo '${{vars.SPCD}}' | tr -d "\r" | sh -s - run: spcd-build-project - run: spcd-browse-workspace