From 3f75487808e5a0db08baff0e61313df4c81b2d33 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 11:04:17 +0200 Subject: [PATCH 01/10] readme/universe --- readme.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/readme.md b/readme.md index e9fbf4c..df1f3d1 100644 --- a/readme.md +++ b/readme.md @@ -60,22 +60,22 @@ from various contexts of CA, CI and OCI / OS. ## Packages -| os | s | u | python | gviz | plantuml | shch | spx | shf | ruf | -|:----------------|---|---|:------------|:-----|:----------|:-----|:----|:----|:----| -| Arch 20240101 | ☑ | ☑ | 3.12 | 12.0 | 1.2023.13 | 0.10 | 7.4 | 3.8 | 0.5 | -| Fedora 40 | ☑ | ☑ | 3.12 → 3.13 | 9.0 | 1.2024.6 | 0.9 | 7.2 | 3.7 | 0.4 | -| Alpine 3.20 | ☑ | ☐ | 3.12 | 9.0 | 1.2024.4 | 0.10 | 7.2 | 3.8 | 0.4 | -| Ubuntu Noble | ☐ | ☐ | 3.12 | 2.42 | 1.2020.2 | 0.9 | 7.2 | 3.8 | | -| Debian Bookworm | ☐ | ☐ | 3.11 | 2.42 | 1.2020.2 | 0.9 | 5.3 | 3.6 | | -| Alma / Rocky 9 | ☑ | ☑ | 3.9 → 3.12 | 2.44 | e1.2024.6 | e0.8 | | | | +| os | s | u | python | grviz | plantuml | shch | spx | shfm | ruf | +|:----------------|---|---|:------------|:------|:----------|:-----|:----|:-----|:----| +| Arch 20240101 | ☑ | ☑ | 3.12 | 12.0 | 1.2023.13 | 0.10 | 7.4 | 3.8 | 0.5 | +| Fedora 40 | ☑ | ☑ | 3.12 → 3.13 | 9.0 | 1.2024.6 | 0.9 | 7.2 | 3.7 | 0.4 | +| Alpine 3.20 | ☑ | ☐ | 3.12 | 9.0 | 1.2024.4 | 0.10 | 7.2 | 3.8 | 0.4 | +| Ubuntu Noble | ☐ | ☐ | 3.12 | u2.42 | u1.2020.2 | u0.9 | 7.2 | u3.8 | | +| Debian Bookworm | ☐ | ☐ | 3.11 | 2.42 | 1.2020.2 | 0.9 | 5.3 | 3.6 | | +| Alma / Rocky 9 | ☑ | ☑ | 3.9 → 3.12 | 2.44 | e1.2024.6 | e0.8 | | | | -| os | s | u | python | gviz | plantuml | shch | spx | shf | ruf | -|:----------------|---|---|:------------|:-----|:----------|:-----|:----|:----|:----| -| Fedora 39 | ☑ | ☑ | 3.12 → 3.13 | 8.1 | 1.2024.6 | 0.9 | 6.2 | 3.5 | 0.4 | -| Alpine 3.19 | ☑ | ☐ | 3.11 | 9.0 | 1.2023.12 | 0.9 | 6.2 | 3.7 | | -| Ubuntu Jammy | ☐ | ☐ | 3.10 | 2.42 | 1.2020.2 | 0.8 | 4.3 | 3.4 | | -| Debian Bullseye | ☐ | ☐ | 3.9 | 2.42 | 1.2020.2 | 0.7 | 3.4 | | | -| Alma / Rocky 8 | ☑ | ☑ | 3.6 → 3.12 | 2.40 | e1.2024.6 | e0.6 | | | | +| os | s | u | python | grviz | plantuml | shch | spx | shfm | ruf | +|:----------------|---|---|:------------|:------|:----------|:-----|:----|:-----|:----| +| Fedora 39 | ☑ | ☑ | 3.12 → 3.13 | 8.1 | 1.2024.6 | 0.9 | 6.2 | 3.5 | 0.4 | +| Alpine 3.19 | ☑ | ☐ | 3.11 | 9.0 | 1.2023.12 | 0.9 | 6.2 | 3.7 | | +| Ubuntu Jammy | ☐ | ☐ | 3.10 | u2.42 | u1.2020.2 | u0.8 | 4.3 | u3.4 | | +| Debian Bullseye | ☐ | ☐ | 3.9 | 2.42 | 1.2020.2 | 0.7 | 3.4 | | | +| Alma / Rocky 8 | ☑ | ☑ | 3.6 → 3.12 | 2.40 | e1.2024.6 | e0.6 | | | | ## Tasks From faad32cc7b39f22d6dca72da416e9e848d187dcb Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 11:34:35 +0200 Subject: [PATCH 02/10] workflows/before --- .forgejo/workflows/{almalinux_8.yaml => before_almalinux_8.yaml} | 0 .forgejo/workflows/{alpine_3.19.yaml => before_alpine_3.19.yaml} | 0 ...0.191179.yaml => before_archlinux_base-20231112.0.191179.yaml} | 0 .../{debian_bullseye.yaml => before_debian_bullseye.yaml} | 0 .forgejo/workflows/{fedora_39.yaml => before_fedora_39.yaml} | 0 .../workflows/{rockylinux_8.yaml => before_rockylinux_8.yaml} | 0 .../workflows/{ubuntu_jammy.yaml => before_ubuntu_jammy.yaml} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename .forgejo/workflows/{almalinux_8.yaml => before_almalinux_8.yaml} (100%) rename .forgejo/workflows/{alpine_3.19.yaml => before_alpine_3.19.yaml} (100%) rename .forgejo/workflows/{archlinux_base-20231112.0.191179.yaml => before_archlinux_base-20231112.0.191179.yaml} (100%) rename .forgejo/workflows/{debian_bullseye.yaml => before_debian_bullseye.yaml} (100%) rename .forgejo/workflows/{fedora_39.yaml => before_fedora_39.yaml} (100%) rename .forgejo/workflows/{rockylinux_8.yaml => before_rockylinux_8.yaml} (100%) rename .forgejo/workflows/{ubuntu_jammy.yaml => before_ubuntu_jammy.yaml} (100%) diff --git a/.forgejo/workflows/almalinux_8.yaml b/.forgejo/workflows/before_almalinux_8.yaml similarity index 100% rename from .forgejo/workflows/almalinux_8.yaml rename to .forgejo/workflows/before_almalinux_8.yaml diff --git a/.forgejo/workflows/alpine_3.19.yaml b/.forgejo/workflows/before_alpine_3.19.yaml similarity index 100% rename from .forgejo/workflows/alpine_3.19.yaml rename to .forgejo/workflows/before_alpine_3.19.yaml diff --git a/.forgejo/workflows/archlinux_base-20231112.0.191179.yaml b/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml similarity index 100% rename from .forgejo/workflows/archlinux_base-20231112.0.191179.yaml rename to .forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml diff --git a/.forgejo/workflows/debian_bullseye.yaml b/.forgejo/workflows/before_debian_bullseye.yaml similarity index 100% rename from .forgejo/workflows/debian_bullseye.yaml rename to .forgejo/workflows/before_debian_bullseye.yaml diff --git a/.forgejo/workflows/fedora_39.yaml b/.forgejo/workflows/before_fedora_39.yaml similarity index 100% rename from .forgejo/workflows/fedora_39.yaml rename to .forgejo/workflows/before_fedora_39.yaml diff --git a/.forgejo/workflows/rockylinux_8.yaml b/.forgejo/workflows/before_rockylinux_8.yaml similarity index 100% rename from .forgejo/workflows/rockylinux_8.yaml rename to .forgejo/workflows/before_rockylinux_8.yaml diff --git a/.forgejo/workflows/ubuntu_jammy.yaml b/.forgejo/workflows/before_ubuntu_jammy.yaml similarity index 100% rename from .forgejo/workflows/ubuntu_jammy.yaml rename to .forgejo/workflows/before_ubuntu_jammy.yaml From a5862c44554ab6feeb7539a677379dc57efe407e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 11:36:59 +0200 Subject: [PATCH 03/10] workflows/latest --- .forgejo/workflows/{almalinux_9.yaml => latest_almalinux_9.yaml} | 0 .forgejo/workflows/{alpine_3.20.yaml => latest_alpine_3.20.yaml} | 0 ...0.204074.yaml => latest_archlinux_base-20240101.0.204074.yaml} | 0 .../{debian_bookworm.yaml => latest_debian_bookworm.yaml} | 0 .forgejo/workflows/{fedora_40.yaml => latest_fedora_40.yaml} | 0 .../workflows/{rockylinux_9.yaml => latest_rockylinux_9.yaml} | 0 .../workflows/{ubuntu_noble.yaml => latest_ubuntu_noble.yaml} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename .forgejo/workflows/{almalinux_9.yaml => latest_almalinux_9.yaml} (100%) rename .forgejo/workflows/{alpine_3.20.yaml => latest_alpine_3.20.yaml} (100%) rename .forgejo/workflows/{archlinux_base-20240101.0.204074.yaml => latest_archlinux_base-20240101.0.204074.yaml} (100%) rename .forgejo/workflows/{debian_bookworm.yaml => latest_debian_bookworm.yaml} (100%) rename .forgejo/workflows/{fedora_40.yaml => latest_fedora_40.yaml} (100%) rename .forgejo/workflows/{rockylinux_9.yaml => latest_rockylinux_9.yaml} (100%) rename .forgejo/workflows/{ubuntu_noble.yaml => latest_ubuntu_noble.yaml} (100%) diff --git a/.forgejo/workflows/almalinux_9.yaml b/.forgejo/workflows/latest_almalinux_9.yaml similarity index 100% rename from .forgejo/workflows/almalinux_9.yaml rename to .forgejo/workflows/latest_almalinux_9.yaml diff --git a/.forgejo/workflows/alpine_3.20.yaml b/.forgejo/workflows/latest_alpine_3.20.yaml similarity index 100% rename from .forgejo/workflows/alpine_3.20.yaml rename to .forgejo/workflows/latest_alpine_3.20.yaml diff --git a/.forgejo/workflows/archlinux_base-20240101.0.204074.yaml b/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml similarity index 100% rename from .forgejo/workflows/archlinux_base-20240101.0.204074.yaml rename to .forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml diff --git a/.forgejo/workflows/debian_bookworm.yaml b/.forgejo/workflows/latest_debian_bookworm.yaml similarity index 100% rename from .forgejo/workflows/debian_bookworm.yaml rename to .forgejo/workflows/latest_debian_bookworm.yaml diff --git a/.forgejo/workflows/fedora_40.yaml b/.forgejo/workflows/latest_fedora_40.yaml similarity index 100% rename from .forgejo/workflows/fedora_40.yaml rename to .forgejo/workflows/latest_fedora_40.yaml diff --git a/.forgejo/workflows/rockylinux_9.yaml b/.forgejo/workflows/latest_rockylinux_9.yaml similarity index 100% rename from .forgejo/workflows/rockylinux_9.yaml rename to .forgejo/workflows/latest_rockylinux_9.yaml diff --git a/.forgejo/workflows/ubuntu_noble.yaml b/.forgejo/workflows/latest_ubuntu_noble.yaml similarity index 100% rename from .forgejo/workflows/ubuntu_noble.yaml rename to .forgejo/workflows/latest_ubuntu_noble.yaml From 12ce56cdeb5ca6a4f535f666c04a60a80179030e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 11:37:51 +0200 Subject: [PATCH 04/10] workflows/main --- .github/workflows/{debian_bookworm.yaml => main.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{debian_bookworm.yaml => main.yaml} (100%) diff --git a/.github/workflows/debian_bookworm.yaml b/.github/workflows/main.yaml similarity index 100% rename from .github/workflows/debian_bookworm.yaml rename to .github/workflows/main.yaml From d0ffcf2343aac6713d4692aa0cafe0e3afb35d5b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 11:51:19 +0200 Subject: [PATCH 05/10] shfmt/bullseye --- spcd.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spcd.sh b/spcd.sh index 1db0604..f58bd2e 100644 --- a/spcd.sh +++ b/spcd.sh @@ -649,6 +649,9 @@ spcd_install_packages() { spcd_step "Install ShellFormat" case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") ;; + "${SPCD_OS_DEBIAN}") + [ "${SPCD_OS_VERSION}" != "bullseye" ] && spcd_install_package "shfmt" + ;; *) spcd_install_package "shfmt" ;; esac # ssh From b291a4d68452733606379f0c96cea552ac97147f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 11:57:18 +0200 Subject: [PATCH 06/10] 80 --- spcd.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spcd.sh b/spcd.sh index f58bd2e..2ac7aa8 100644 --- a/spcd.sh +++ b/spcd.sh @@ -606,7 +606,9 @@ spcd_install_packages() { # epel spcd_step "Install EPEL" case "${SPCD_OS_ID}" in - "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") spcd_install_package "epel-release" ;; + "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") + spcd_install_package "epel-release" + ;; *) ;; esac # graphviz @@ -657,7 +659,9 @@ spcd_install_packages() { # ssh spcd_step "Install SSH" case "${SPCD_PM}" in - "${SPCD_PM_APK}" | "${SPCD_PM_APT}") spcd_install_package "openssh-client" ;; + "${SPCD_PM_APK}" | "${SPCD_PM_APT}") + spcd_install_package "openssh-client" + ;; "${SPCD_PM_DNF}") spcd_install_package "openssh-clients" ;; "${SPCD_PM_PACMAN}") spcd_install_package "openssh" ;; *) ;; From f9e7c0f831c7df88dab9aefbfe956962ddbf01ed Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 11:58:37 +0200 Subject: [PATCH 07/10] 80 --- spcd.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 2ac7aa8..2cc4e4e 100644 --- a/spcd.sh +++ b/spcd.sh @@ -66,7 +66,8 @@ spcd_set_environment_variables() { SPCD_PROJECT_ROOT="$(dirname "${GITHUB_SERVER_URL}")//" [ -n "${GITHUB_TOKEN}" ] && SPCD_PROJECT_ROOT="${SPCD_PROJECT_ROOT}${GITHUB_TOKEN}@" - SPCD_PROJECT_ROOT="${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" + SPCD_PROJECT_ROOT="\ +${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" else spcd_error_ci "GITHUB_SERVER_URL" fi From 82da8443ea14095e76ffa909db55fbc6e319e7bd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 12:00:17 +0200 Subject: [PATCH 08/10] 80/branches --- spcd.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 2cc4e4e..c05fba9 100644 --- a/spcd.sh +++ b/spcd.sh @@ -129,7 +129,9 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" fi # check project variables case "${SPCD_PROJECT_BRANCH}" in - "${SPCD_BRANCH_RELEASE}" | "${SPCD_BRANCH_STAGING}" | "${SPCD_BRANCH_FEATURE}") ;; + "${SPCD_BRANCH_RELEASE}" | \ + "${SPCD_BRANCH_STAGING}" | \ + "${SPCD_BRANCH_FEATURE}") ;; *) spcd_error_ci "SPCD_PROJECT_BRANCH" ;; esac [ -n "${SPCD_PROJECT_ROOT}" ] || spcd_error_ci "SPCD_PROJECT_ROOT" From 4e087ead788646aff45c24f4da7d13b92a9bc1b8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 12:06:45 +0200 Subject: [PATCH 09/10] ruff --- spcd.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spcd.sh b/spcd.sh index c05fba9..647bd0e 100644 --- a/spcd.sh +++ b/spcd.sh @@ -644,6 +644,15 @@ spcd_install_packages() { # rsync spcd_step "Install Rsync" spcd_install_package "rsync" + # ruff + spcd_step "Install Ruff" + case "${SPCD_OS_ID}" in + "${SPCD_OS_ALPINE}") + [ "${SPCD_OS_VERSION}" != "3.19" ] && spcd_install_package "ruff" + ;; + "${SPCD_OS_ARCH}" | "${SPCD_OS_FEDORA}") spcd_install_package "ruff" ;; + *) ;; + esac # shellcheck spcd_step "Install ShellCheck" case "${SPCD_PM}" in From 65777940183764899121ff9842368d0ec4279637 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Jul 2024 12:09:10 +0200 Subject: [PATCH 10/10] shell check --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 647bd0e..d1973ed 100644 --- a/spcd.sh +++ b/spcd.sh @@ -653,7 +653,7 @@ spcd_install_packages() { "${SPCD_OS_ARCH}" | "${SPCD_OS_FEDORA}") spcd_install_package "ruff" ;; *) ;; esac - # shellcheck + # shell check spcd_step "Install ShellCheck" case "${SPCD_PM}" in "${SPCD_PM_DNF}") spcd_install_package "ShellCheck" ;;