diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index fd1bcd0..2cdb6a2 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -6,12 +6,11 @@ jobs: steps: - name: spcd env: - SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} - SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} + SPCD: ${{vars.SPCD}} SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} + 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/.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..4733f41 --- /dev/null +++ b/.gitea/workflows/main.yaml @@ -0,0 +1,15 @@ +on: [push] +jobs: + job: + container: + image: ${{vars.DOCKER}}debian:bookworm + steps: + - name: spcd + env: + SPCD: ${{vars.SPCD}} + 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 337fc88..2558b3b 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -7,12 +7,10 @@ jobs: steps: - name: spcd env: + SPCD: ${{vars.SPCD}} SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}} SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}} - SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} - run: echo '${{vars.SPCD}}' | tr -d '\r' | sh -s + 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..7ff26d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,7 @@ image: ${DOCKER}debian:bookworm job: script: - - sh ${SPCD} + - echo "${SPCD}" | sh -s - - spcd-list-environment - spcd-build-project - spcd-browse-workspace 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)