diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index 2cdb6a2..fd1bcd0 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -6,11 +6,12 @@ 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}} - 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 new file mode 120000 index 0000000..d9a4b42 --- /dev/null +++ b/.gitea @@ -0,0 +1 @@ +.forgejo \ No newline at end of file diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml deleted file mode 100644 index 4733f41..0000000 --- a/.gitea/workflows/main.yaml +++ /dev/null @@ -1,15 +0,0 @@ -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 2558b3b..337fc88 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -7,10 +7,12 @@ 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 + SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} + 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 7ff26d9..859dff8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,8 @@ image: ${DOCKER}debian:bookworm job: script: - - echo "${SPCD}" | sh -s + - sh ${SPCD} + - spcd-list-environment - spcd-build-project - spcd-browse-workspace diff --git a/readme.md b/readme.md index 38c1b90..3f1c37d 100644 --- a/readme.md +++ b/readme.md @@ -16,7 +16,6 @@ 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)