From c5ede4d6e97b97eb0c3d642909934df30606183a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 28 Jul 2024 17:10:54 +0200 Subject: [PATCH 1/5] readme/tasks --- readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.md b/readme.md index 6a0a809..68983cc 100644 --- a/readme.md +++ b/readme.md @@ -103,4 +103,6 @@ from various contexts of CA, CI and OCI / OS. ### .sh +* check if file & variable match +* clone branch if not gitlab * support opensuse From 5eae674f2023c75c48cb502589741607e34e4771 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 28 Jul 2024 17:15:00 +0200 Subject: [PATCH 2/5] docker --- .forgejo/workflows/before_almalinux_8.yaml | 2 +- .forgejo/workflows/before_alpine_3.19.yaml | 2 +- .forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml | 2 +- .forgejo/workflows/before_debian_bullseye.yaml | 2 +- .forgejo/workflows/before_fedora_39.yaml | 2 +- .forgejo/workflows/before_rockylinux_8.yaml | 2 +- .forgejo/workflows/before_ubuntu_jammy.yaml | 2 +- .forgejo/workflows/latest_almalinux_9.yaml | 2 +- .forgejo/workflows/latest_alpine_3.20.yaml | 2 +- .forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml | 2 +- .forgejo/workflows/latest_debian_bookworm.yaml | 2 +- .forgejo/workflows/latest_fedora_40.yaml | 2 +- .forgejo/workflows/latest_rockylinux_9.yaml | 2 +- .forgejo/workflows/latest_ubuntu_noble.yaml | 2 +- .github/workflows/main.yaml | 2 +- .gitlab-ci.yml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.forgejo/workflows/before_almalinux_8.yaml b/.forgejo/workflows/before_almalinux_8.yaml index 32b4601..7f574b1 100644 --- a/.forgejo/workflows/before_almalinux_8.yaml +++ b/.forgejo/workflows/before_almalinux_8.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/almalinux:8 + image: ${{vars.DOCKER}}almalinux:8 steps: - name: spcd run: > diff --git a/.forgejo/workflows/before_alpine_3.19.yaml b/.forgejo/workflows/before_alpine_3.19.yaml index 0f1bc00..69dd0ff 100644 --- a/.forgejo/workflows/before_alpine_3.19.yaml +++ b/.forgejo/workflows/before_alpine_3.19.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/alpine:3.19 + image: ${{vars.DOCKER}}alpine:3.19 steps: - name: spcd run: > diff --git a/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml b/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml index 5980a5a..8daa820 100644 --- a/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml +++ b/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/archlinux:base-20231112.0.191179 + image: ${{vars.DOCKER}}archlinux:base-20231112.0.191179 steps: - name: spcd run: > diff --git a/.forgejo/workflows/before_debian_bullseye.yaml b/.forgejo/workflows/before_debian_bullseye.yaml index 7cc0456..78c4059 100644 --- a/.forgejo/workflows/before_debian_bullseye.yaml +++ b/.forgejo/workflows/before_debian_bullseye.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/debian:bullseye + image: ${{vars.DOCKER}}debian:bullseye steps: - name: spcd run: > diff --git a/.forgejo/workflows/before_fedora_39.yaml b/.forgejo/workflows/before_fedora_39.yaml index 540a7c4..d151323 100644 --- a/.forgejo/workflows/before_fedora_39.yaml +++ b/.forgejo/workflows/before_fedora_39.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/fedora:39 + image: ${{vars.DOCKER}}fedora:39 steps: - name: spcd run: > diff --git a/.forgejo/workflows/before_rockylinux_8.yaml b/.forgejo/workflows/before_rockylinux_8.yaml index 41ce0a7..1e834d8 100644 --- a/.forgejo/workflows/before_rockylinux_8.yaml +++ b/.forgejo/workflows/before_rockylinux_8.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/rockylinux:8 + image: ${{vars.DOCKER}}rockylinux:8 steps: - name: spcd run: > diff --git a/.forgejo/workflows/before_ubuntu_jammy.yaml b/.forgejo/workflows/before_ubuntu_jammy.yaml index 51b7f82..100816b 100644 --- a/.forgejo/workflows/before_ubuntu_jammy.yaml +++ b/.forgejo/workflows/before_ubuntu_jammy.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/ubuntu:jammy + image: ${{vars.DOCKER}}ubuntu:jammy steps: - name: spcd run: > diff --git a/.forgejo/workflows/latest_almalinux_9.yaml b/.forgejo/workflows/latest_almalinux_9.yaml index 9592b82..4d94b10 100644 --- a/.forgejo/workflows/latest_almalinux_9.yaml +++ b/.forgejo/workflows/latest_almalinux_9.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/almalinux:9 + image: ${{vars.DOCKER}}almalinux:9 steps: - name: spcd run: > diff --git a/.forgejo/workflows/latest_alpine_3.20.yaml b/.forgejo/workflows/latest_alpine_3.20.yaml index 40ba169..5e91247 100644 --- a/.forgejo/workflows/latest_alpine_3.20.yaml +++ b/.forgejo/workflows/latest_alpine_3.20.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/alpine:3.20 + image: ${{vars.DOCKER}}alpine:3.20 steps: - name: spcd run: > diff --git a/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml b/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml index 762db90..b8e55a6 100644 --- a/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml +++ b/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/archlinux:base-20240101.0.204074 + image: ${{vars.DOCKER}}archlinux:base-20240101.0.204074 steps: - name: spcd run: > diff --git a/.forgejo/workflows/latest_debian_bookworm.yaml b/.forgejo/workflows/latest_debian_bookworm.yaml index d8059a9..e7b1cbe 100644 --- a/.forgejo/workflows/latest_debian_bookworm.yaml +++ b/.forgejo/workflows/latest_debian_bookworm.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/debian:bookworm + image: ${{vars.DOCKER}}debian:bookworm steps: - name: spcd run: > diff --git a/.forgejo/workflows/latest_fedora_40.yaml b/.forgejo/workflows/latest_fedora_40.yaml index b3e27ba..7b2d521 100644 --- a/.forgejo/workflows/latest_fedora_40.yaml +++ b/.forgejo/workflows/latest_fedora_40.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/fedora:40 + image: ${{vars.DOCKER}}fedora:40 steps: - name: spcd run: > diff --git a/.forgejo/workflows/latest_rockylinux_9.yaml b/.forgejo/workflows/latest_rockylinux_9.yaml index 37ee425..3db20e1 100644 --- a/.forgejo/workflows/latest_rockylinux_9.yaml +++ b/.forgejo/workflows/latest_rockylinux_9.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/rockylinux:9 + image: ${{vars.DOCKER}}rockylinux:9 steps: - name: spcd run: > diff --git a/.forgejo/workflows/latest_ubuntu_noble.yaml b/.forgejo/workflows/latest_ubuntu_noble.yaml index 6135bae..7d004cd 100644 --- a/.forgejo/workflows/latest_ubuntu_noble.yaml +++ b/.forgejo/workflows/latest_ubuntu_noble.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ${{vars.DOCKER||'docker.io'}}/ubuntu:noble + image: ${{vars.DOCKER}}ubuntu:noble steps: - name: spcd run: > diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 2f83aa6..c4e3598 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -3,7 +3,7 @@ jobs: job: runs-on: ubuntu-latest container: - image: ${{vars.DOCKER||'docker.io'}}/debian:bookworm + image: ${{vars.DOCKER}}debian:bookworm steps: - name: spcd run: > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ad2e71..2cde8c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ${DOCKER:-docker.io}/debian:bookworm +image: ${DOCKER}debian:bookworm job: script: - > From ff8a371253b894d6a89f7ffc90654fada0301bec Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 28 Jul 2024 20:34:44 +0200 Subject: [PATCH 3/5] clone-branch --- .forgejo/workflows/before_almalinux_8.yaml | 1 - .forgejo/workflows/before_alpine_3.19.yaml | 1 - .forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml | 1 - .forgejo/workflows/before_debian_bullseye.yaml | 1 - .forgejo/workflows/before_fedora_39.yaml | 1 - .forgejo/workflows/before_rockylinux_8.yaml | 1 - .forgejo/workflows/before_ubuntu_jammy.yaml | 1 - .forgejo/workflows/latest_almalinux_9.yaml | 1 - .forgejo/workflows/latest_alpine_3.20.yaml | 1 - .forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml | 1 - .forgejo/workflows/latest_debian_bookworm.yaml | 1 - .forgejo/workflows/latest_fedora_40.yaml | 1 - .forgejo/workflows/latest_rockylinux_9.yaml | 1 - .forgejo/workflows/latest_ubuntu_noble.yaml | 1 - .github/workflows/main.yaml | 1 - .gitlab-ci.yml | 1 - 16 files changed, 16 deletions(-) diff --git a/.forgejo/workflows/before_almalinux_8.yaml b/.forgejo/workflows/before_almalinux_8.yaml index 7f574b1..04336c1 100644 --- a/.forgejo/workflows/before_almalinux_8.yaml +++ b/.forgejo/workflows/before_almalinux_8.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 69dd0ff..efd48cd 100644 --- a/.forgejo/workflows/before_alpine_3.19.yaml +++ b/.forgejo/workflows/before_alpine_3.19.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 8daa820..e4f2dae 100644 --- a/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml +++ b/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 78c4059..eb998cf 100644 --- a/.forgejo/workflows/before_debian_bullseye.yaml +++ b/.forgejo/workflows/before_debian_bullseye.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 d151323..191cd82 100644 --- a/.forgejo/workflows/before_fedora_39.yaml +++ b/.forgejo/workflows/before_fedora_39.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 1e834d8..8f1c73b 100644 --- a/.forgejo/workflows/before_rockylinux_8.yaml +++ b/.forgejo/workflows/before_rockylinux_8.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 100816b..ac47086 100644 --- a/.forgejo/workflows/before_ubuntu_jammy.yaml +++ b/.forgejo/workflows/before_ubuntu_jammy.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 4d94b10..14522c8 100644 --- a/.forgejo/workflows/latest_almalinux_9.yaml +++ b/.forgejo/workflows/latest_almalinux_9.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 5e91247..a360d1c 100644 --- a/.forgejo/workflows/latest_alpine_3.20.yaml +++ b/.forgejo/workflows/latest_alpine_3.20.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 b8e55a6..e5df378 100644 --- a/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml +++ b/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 e7b1cbe..4840396 100644 --- a/.forgejo/workflows/latest_debian_bookworm.yaml +++ b/.forgejo/workflows/latest_debian_bookworm.yaml @@ -11,7 +11,6 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 7b2d521..78964f9 100644 --- a/.forgejo/workflows/latest_fedora_40.yaml +++ b/.forgejo/workflows/latest_fedora_40.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 3db20e1..c8be126 100644 --- a/.forgejo/workflows/latest_rockylinux_9.yaml +++ b/.forgejo/workflows/latest_rockylinux_9.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - 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 7d004cd..17c88ab 100644 --- a/.forgejo/workflows/latest_ubuntu_noble.yaml +++ b/.forgejo/workflows/latest_ubuntu_noble.yaml @@ -11,6 +11,5 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - run: spcd-build-project - run: spcd-browse-workspace diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c4e3598..06e1b40 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -12,7 +12,6 @@ jobs: "${{vars.SPCD_SSH_HOSTS}}" - run: spcd-list-environment - - run: spcd-clone-branch - run: spcd-build-project - run: spcd-browse-workspace - run: spcd-synchronize diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cde8c7..e8bd6db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,5 @@ job: ${SPCD_SSH_HOSTS} - spcd-list-environment - - spcd-clone-branch - spcd-build-project - spcd-browse-workspace From e200ff583bf3a39849535fae0fbe26c2d221cd69 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 28 Jul 2024 20:54:20 +0200 Subject: [PATCH 4/5] clone_project_branch --- spcd/__init__.py | 30 ++++++++++++++++++++++++++---- spcd/cmd.py | 22 +--------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/spcd/__init__.py b/spcd/__init__.py index 8d5ab7d..90442b2 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -9,13 +9,34 @@ from rwx import fs from rwx.log import stream as log from rwx.ps import run -import spcd from spcd import cmd -from spcd.util import browse, cat, step +from spcd.ci import project, projects +from spcd.util import browse, cat, split, step COMMANDS_PREFIX = "spcd-" +def clone_project_branch() -> None: + step("Clone project branch") + log.info(projects) + split() + log.info(project) + split() + log.info(f"""\ +{project.url} +↓ +""") + run( + "git", + "clone", + "--branch", + project.branch, + "--", + project.url, + project.root, + ) + + def install_commands(path: str) -> None: step("Install commands") user = Path("/usr/local/bin") @@ -34,8 +55,9 @@ def main(main: str) -> None: path, *arguments = sys.argv name = Path(path).name if name == "__main__.py": - spcd.set_ssh(*arguments) - spcd.install_commands(main) + clone_project_branch() + set_ssh(*arguments) + install_commands(main) else: function = getattr(cmd, name.replace("-", "_")) function(*arguments) diff --git a/spcd/cmd.py b/spcd/cmd.py index 79531d4..052a9f0 100644 --- a/spcd/cmd.py +++ b/spcd/cmd.py @@ -6,7 +6,7 @@ from rwx import ps from rwx.log import stream as log from spcd.ci import project, projects -from spcd.util import browse, split +from spcd.util import browse def spcd_browse_workspace() -> None: @@ -23,26 +23,6 @@ def spcd_build_project() -> None: pass -def spcd_clone_branch() -> None: - log.info(projects) - split() - log.info(project) - split() - log.info(f"""\ -{project.url} -↓ -""") - ps.run( - "git", - "clone", - "--branch", - project.branch, - "--", - project.url, - project.root, - ) - - def spcd_list_environment() -> None: for variable, value in sorted(projects.environment.items()): log.info(f"{variable} = {value}") From ee69c088c2cba082ed4a59896657ab1f8647441a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 28 Jul 2024 21:48:52 +0200 Subject: [PATCH 5/5] clone/gitlab --- readme.md | 1 - spcd/__init__.py | 31 ++++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/readme.md b/readme.md index 68983cc..96dd8ef 100644 --- a/readme.md +++ b/readme.md @@ -104,5 +104,4 @@ from various contexts of CA, CI and OCI / OS. ### .sh * check if file & variable match -* clone branch if not gitlab * support opensuse diff --git a/spcd/__init__.py b/spcd/__init__.py index 90442b2..2403025 100644 --- a/spcd/__init__.py +++ b/spcd/__init__.py @@ -17,24 +17,25 @@ COMMANDS_PREFIX = "spcd-" def clone_project_branch() -> None: - step("Clone project branch") - log.info(projects) - split() - log.info(project) - split() - log.info(f"""\ + if not projects.environment.get("GITLAB_CI"): + step("Clone project branch") + log.info(projects) + split() + log.info(project) + split() + log.info(f"""\ {project.url} ↓ """) - run( - "git", - "clone", - "--branch", - project.branch, - "--", - project.url, - project.root, - ) + run( + "git", + "clone", + "--branch", + project.branch, + "--", + project.url, + project.root, + ) def install_commands(path: str) -> None: