diff --git a/.forgejo/workflows/almalinux:8.yaml b/.forgejo/workflows/almalinux:8.yaml index 530a6bd..119a65d 100644 --- a/.forgejo/workflows/almalinux:8.yaml +++ b/.forgejo/workflows/almalinux:8.yaml @@ -5,7 +5,7 @@ jobs: image: almalinux:8 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/almalinux:9.yaml b/.forgejo/workflows/almalinux:9.yaml index 5b9eee6..1adbd7c 100644 --- a/.forgejo/workflows/almalinux:9.yaml +++ b/.forgejo/workflows/almalinux:9.yaml @@ -5,7 +5,7 @@ jobs: image: almalinux:9 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/alpine:3.18.yaml b/.forgejo/workflows/alpine:3.18.yaml index e1ecd97..bb87efb 100644 --- a/.forgejo/workflows/alpine:3.18.yaml +++ b/.forgejo/workflows/alpine:3.18.yaml @@ -5,7 +5,7 @@ jobs: image: alpine:3.18 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/alpine:3.19.yaml b/.forgejo/workflows/alpine:3.19.yaml index ca17aa7..98437d5 100644 --- a/.forgejo/workflows/alpine:3.19.yaml +++ b/.forgejo/workflows/alpine:3.19.yaml @@ -5,7 +5,7 @@ jobs: image: alpine:3.19 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/archlinux:base-20231112.0.191179.yaml b/.forgejo/workflows/archlinux:base-20231112.0.191179.yaml index 7707cd9..be6085d 100644 --- a/.forgejo/workflows/archlinux:base-20231112.0.191179.yaml +++ b/.forgejo/workflows/archlinux:base-20231112.0.191179.yaml @@ -5,7 +5,7 @@ jobs: image: archlinux:base-20231112.0.191179 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/archlinux:base-20240101.0.204074.yaml b/.forgejo/workflows/archlinux:base-20240101.0.204074.yaml index f6193df..0f9a097 100644 --- a/.forgejo/workflows/archlinux:base-20240101.0.204074.yaml +++ b/.forgejo/workflows/archlinux:base-20240101.0.204074.yaml @@ -5,7 +5,7 @@ jobs: image: archlinux:base-20240101.0.204074 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/debian:bookworm.yaml b/.forgejo/workflows/debian:bookworm.yaml index 6f1e11c..c6f4ae1 100644 --- a/.forgejo/workflows/debian:bookworm.yaml +++ b/.forgejo/workflows/debian:bookworm.yaml @@ -5,7 +5,7 @@ jobs: image: debian:bookworm steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/debian:bullseye.yaml b/.forgejo/workflows/debian:bullseye.yaml index 8aa29cb..7a1d736 100644 --- a/.forgejo/workflows/debian:bullseye.yaml +++ b/.forgejo/workflows/debian:bullseye.yaml @@ -5,7 +5,7 @@ jobs: image: debian:bullseye steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/fedora:39.yaml b/.forgejo/workflows/fedora:39.yaml index 2401417..aad0848 100644 --- a/.forgejo/workflows/fedora:39.yaml +++ b/.forgejo/workflows/fedora:39.yaml @@ -5,7 +5,7 @@ jobs: image: fedora:39 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/fedora:40.yaml b/.forgejo/workflows/fedora:40.yaml index 41bf19b..fd1d5f9 100644 --- a/.forgejo/workflows/fedora:40.yaml +++ b/.forgejo/workflows/fedora:40.yaml @@ -5,7 +5,7 @@ jobs: image: fedora:40 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/rockylinux:8.yaml b/.forgejo/workflows/rockylinux:8.yaml index 1eb64d3..54a1962 100644 --- a/.forgejo/workflows/rockylinux:8.yaml +++ b/.forgejo/workflows/rockylinux:8.yaml @@ -5,7 +5,7 @@ jobs: image: rockylinux:8 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/rockylinux:9.yaml b/.forgejo/workflows/rockylinux:9.yaml index 3d69c66..64d98a4 100644 --- a/.forgejo/workflows/rockylinux:9.yaml +++ b/.forgejo/workflows/rockylinux:9.yaml @@ -5,7 +5,7 @@ jobs: image: rockylinux:9 steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/ubuntu:jammy.yaml b/.forgejo/workflows/ubuntu:jammy.yaml index fab1198..33c4578 100644 --- a/.forgejo/workflows/ubuntu:jammy.yaml +++ b/.forgejo/workflows/ubuntu:jammy.yaml @@ -5,7 +5,7 @@ jobs: image: ubuntu:jammy steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.forgejo/workflows/ubuntu:noble.yaml b/.forgejo/workflows/ubuntu:noble.yaml index f80644d..739ca7c 100644 --- a/.forgejo/workflows/ubuntu:noble.yaml +++ b/.forgejo/workflows/ubuntu:noble.yaml @@ -5,7 +5,7 @@ jobs: image: ubuntu:noble steps: - name: cd - run: ${{vars.CD}} "${{secrets.CD_SSH_KEY}}" "${{vars.CD_SSH_HOSTS}}" + run: ${{vars.cd}} "${{secrets.cd_ssh_key}}" "${{vars.cd_ssh_hosts}}" - run: cd-list-environment - run: cd-clone-branch diff --git a/.github b/.github new file mode 120000 index 0000000..d9a4b42 --- /dev/null +++ b/.github @@ -0,0 +1 @@ +.forgejo \ No newline at end of file diff --git a/.github/workflows/debian:bookworm.yaml b/.github/workflows/debian:bookworm.yaml deleted file mode 100644 index a0c0b26..0000000 --- a/.github/workflows/debian:bookworm.yaml +++ /dev/null @@ -1,18 +0,0 @@ -on: [push] -jobs: - job: - runs-on: ubuntu-latest - container: - image: debian:bookworm - steps: - - name: cd - run: > - echo '${{vars.CD}}' | tr -d '\r' | sh -s - "${{secrets.CD_SSH_KEY}}" - "${{vars.CD_SSH_HOSTS}}" - - - run: cd-list-environment - - run: cd-clone-branch - - run: cd-build-project - - run: cd-browse-workspace - - run: cd-synchronize diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae03c2b..a3634f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,7 @@ image: debian:bookworm job: script: - - > - sh ${CD} - ${CD_SSH_KEY} - ${CD_SSH_HOSTS} + - sh ${CD} ${CD_SSH_KEY} ${CD_SSH_HOSTS} - cd-list-environment - cd-clone-branch