diff --git a/.forgejo/workflows/before_almalinux_8.yaml b/.forgejo/workflows/before_almalinux_8.yaml index 918d1a6..04336c1 100644 --- a/.forgejo/workflows/before_almalinux_8.yaml +++ b/.forgejo/workflows/before_almalinux_8.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}almalinux:8 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/before_alpine_3.19.yaml b/.forgejo/workflows/before_alpine_3.19.yaml index 04ec3c5..efd48cd 100644 --- a/.forgejo/workflows/before_alpine_3.19.yaml +++ b/.forgejo/workflows/before_alpine_3.19.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}alpine:3.19 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml b/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml index 79805d3..e4f2dae 100644 --- a/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml +++ b/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}archlinux:base-20231112.0.191179 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/before_debian_bullseye.yaml b/.forgejo/workflows/before_debian_bullseye.yaml index ea3a83a..eb998cf 100644 --- a/.forgejo/workflows/before_debian_bullseye.yaml +++ b/.forgejo/workflows/before_debian_bullseye.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}debian:bullseye steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/before_fedora_39.yaml b/.forgejo/workflows/before_fedora_39.yaml index bf2f84f..191cd82 100644 --- a/.forgejo/workflows/before_fedora_39.yaml +++ b/.forgejo/workflows/before_fedora_39.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}fedora:39 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/before_rockylinux_8.yaml b/.forgejo/workflows/before_rockylinux_8.yaml index dc01418..8f1c73b 100644 --- a/.forgejo/workflows/before_rockylinux_8.yaml +++ b/.forgejo/workflows/before_rockylinux_8.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}rockylinux:8 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/before_ubuntu_jammy.yaml b/.forgejo/workflows/before_ubuntu_jammy.yaml index 29fe650..ac47086 100644 --- a/.forgejo/workflows/before_ubuntu_jammy.yaml +++ b/.forgejo/workflows/before_ubuntu_jammy.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}ubuntu:jammy steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/latest_almalinux_9.yaml b/.forgejo/workflows/latest_almalinux_9.yaml index a4f4a9c..14522c8 100644 --- a/.forgejo/workflows/latest_almalinux_9.yaml +++ b/.forgejo/workflows/latest_almalinux_9.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}almalinux:9 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/latest_alpine_3.20.yaml b/.forgejo/workflows/latest_alpine_3.20.yaml index fc61963..a360d1c 100644 --- a/.forgejo/workflows/latest_alpine_3.20.yaml +++ b/.forgejo/workflows/latest_alpine_3.20.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}alpine:3.20 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml b/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml index c1278b2..e5df378 100644 --- a/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml +++ b/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}archlinux:base-20240101.0.204074 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/latest_debian_bookworm.yaml b/.forgejo/workflows/latest_debian_bookworm.yaml index 1e27586..4840396 100644 --- a/.forgejo/workflows/latest_debian_bookworm.yaml +++ b/.forgejo/workflows/latest_debian_bookworm.yaml @@ -5,11 +5,12 @@ jobs: image: ${{vars.DOCKER}}debian:bookworm steps: - name: spcd - env: - SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}} - SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}} - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace - run: spcd-synchronize diff --git a/.forgejo/workflows/latest_fedora_40.yaml b/.forgejo/workflows/latest_fedora_40.yaml index bceb0be..78964f9 100644 --- a/.forgejo/workflows/latest_fedora_40.yaml +++ b/.forgejo/workflows/latest_fedora_40.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}fedora:40 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/latest_rockylinux_9.yaml b/.forgejo/workflows/latest_rockylinux_9.yaml index 52593e3..c8be126 100644 --- a/.forgejo/workflows/latest_rockylinux_9.yaml +++ b/.forgejo/workflows/latest_rockylinux_9.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}rockylinux:9 steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.forgejo/workflows/latest_ubuntu_noble.yaml b/.forgejo/workflows/latest_ubuntu_noble.yaml index c83bd92..17c88ab 100644 --- a/.forgejo/workflows/latest_ubuntu_noble.yaml +++ b/.forgejo/workflows/latest_ubuntu_noble.yaml @@ -5,7 +5,11 @@ jobs: image: ${{vars.DOCKER}}ubuntu:noble steps: - name: spcd - run: ${{vars.SPCD}} + run: > + ${{vars.SPCD}} + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - run: spcd-list-environment - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 21bb544..06e1b40 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -6,7 +6,12 @@ jobs: image: ${{vars.DOCKER}}debian:bookworm steps: - name: spcd - run: echo '${{vars.SPCD}}' | tr -d '\r' | sh -s + run: > + echo '${{vars.SPCD}}' | tr -d '\r' | sh -s + "${{secrets.SPCD_SSH_KEY}}" + "${{vars.SPCD_SSH_HOSTS}}" + - 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 5db3efa..e8bd6db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,11 @@ image: ${DOCKER}debian:bookworm job: script: - - sh ${SPCD} + - > + sh ${SPCD} + ${SPCD_SSH_KEY} + ${SPCD_SSH_HOSTS} + - spcd-list-environment - spcd-build-project - spcd-browse-workspace diff --git a/spcd.sh b/spcd.sh index 6fc7e72..4ff13da 100644 --- a/spcd.sh +++ b/spcd.sh @@ -127,6 +127,7 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" [ -n "${SPCD_PROJECT_PATH}" ] || spcd_error_ci "SPCD_PROJECT_PATH" [ -n "${SPCD_PROJECT_NAME}" ] || spcd_error_ci "SPCD_PROJECT_NAME" # + spcd_split spcd_echo "SPCD_PROJECT_BRANCH" \ "SPCD_PROJECT_ROOT" "SPCD_PROJECT_PATH" "SPCD_PROJECT_NAME" # set path diff --git a/spcd/__init__.py b/spcd/__init__.py index f47533b..ef32424 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -44,26 +44,17 @@ def install_commands(path: str) -> None: for command in [ "browse-workspace", "build-project", + "list-environment", "synchronize", ]: log.info(command) (user / f"{COMMANDS_PREFIX}{command}").symlink_to(path) -def list_environment_variables() -> None: - step("List environment variables") - for variable, value in sorted(projects.environment.items()): - if variable != "SPCD_SSH_KEY": - log.info(f"{variable} = {value}") - else: - log.info(f"{variable}") - - def main(main: str) -> None: path, *arguments = sys.argv name = Path(path).name if name == "__main__.py": - list_environment_variables() clone_project_branch() set_ssh() install_commands(main) diff --git a/spcd/cmd.py b/spcd/cmd.py index bd1fc7b..1e72336 100644 --- a/spcd/cmd.py +++ b/spcd/cmd.py @@ -3,6 +3,7 @@ from pathlib import Path import env from rwx import ps +from rwx.log import stream as log from spcd.ci import project, projects from spcd.util import browse @@ -22,6 +23,14 @@ def spcd_build_project() -> None: pass +def spcd_list_environment() -> None: + for variable, value in sorted(projects.environment.items()): + if variable != "SPCD_SSH_KEY": + log.info(f"{variable} = {value}") + else: + log.info(f"{variable}") + + def spcd_synchronize() -> None: host = env.SPCD_PROJECT_PATH source = "out"