diff --git a/.forgejo/workflows/almalinux:8.yaml b/.forgejo/workflows/almalinux:8.yaml index 119a65d..530a6bd 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 1adbd7c..5b9eee6 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 bb87efb..e1ecd97 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 98437d5..ca17aa7 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 be6085d..7707cd9 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 0f9a097..f6193df 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 c6f4ae1..6f1e11c 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 7a1d736..8aa29cb 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 aad0848..2401417 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 fd1d5f9..41bf19b 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 54a1962..1eb64d3 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 64d98a4..3d69c66 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 33c4578..fab1198 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 739ca7c..f80644d 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 deleted file mode 120000 index d9a4b42..0000000 --- a/.github +++ /dev/null @@ -1 +0,0 @@ -.forgejo \ No newline at end of file diff --git a/.github/workflows/debian:bookworm.yaml b/.github/workflows/debian:bookworm.yaml new file mode 100644 index 0000000..a0c0b26 --- /dev/null +++ b/.github/workflows/debian:bookworm.yaml @@ -0,0 +1,18 @@ +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 a3634f6..ae03c2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,10 @@ 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