diff --git a/.forgejo/workflows/fedora:40.yaml b/.forgejo/workflows/fedora:40.yaml deleted file mode 100644 index beb2f0d..0000000 --- a/.forgejo/workflows/fedora:40.yaml +++ /dev/null @@ -1,13 +0,0 @@ -on: [push] -jobs: - job: - container: - image: fedora:40 - steps: - - name: cd - env: - CD: ${{secrets.cd}} - run: eval ${{vars.cd}} - - - run: cd-list-environment - - run: cd-browse-workspace diff --git a/.forgejo/workflows/ubuntu:jammy.yaml b/.forgejo/workflows/ubuntu:jammy.yaml deleted file mode 100644 index ac3ce6d..0000000 --- a/.forgejo/workflows/ubuntu:jammy.yaml +++ /dev/null @@ -1,13 +0,0 @@ -on: [push] -jobs: - job: - container: - image: ubuntu:jammy - steps: - - name: cd - env: - CD: ${{secrets.cd}} - run: eval ${{vars.cd}} - - - run: cd-list-environment - - run: cd-browse-workspace diff --git a/.forgejo/workflows/fedora:39.yaml b/.forgejo/workflows/ubuntu:mantic.yaml similarity index 87% rename from .forgejo/workflows/fedora:39.yaml rename to .forgejo/workflows/ubuntu:mantic.yaml index 0f0a195..4dc9767 100644 --- a/.forgejo/workflows/fedora:39.yaml +++ b/.forgejo/workflows/ubuntu:mantic.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: fedora:39 + image: ubuntu:mantic steps: - name: cd env: diff --git a/cd.sh b/cd.sh index 48830dc..a1b2398 100644 --- a/cd.sh +++ b/cd.sh @@ -45,13 +45,12 @@ cd_set_environment_variables () { "alpine") CD_OS_ID="${CD_OS_ALPINE}" ;; "arch") CD_OS_ID="${CD_OS_ARCH}" ;; "debian") CD_OS_ID="${CD_OS_DEBIAN}" ;; - "fedora") CD_OS_ID="${CD_OS_FEDORA}" ;; "rocky") CD_OS_ID="${CD_OS_ROCKY}" ;; "ubuntu") CD_OS_ID="${CD_OS_UBUNTU}" ;; *) cd_error_os "CD_OS_ID" ;; esac case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_ARCH}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") + "${CD_OS_ALMA}"|"${CD_OS_ARCH}"|"${CD_OS_ROCKY}") CD_OS_VERSION=$(cd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\)\..*|\1|") ;; @@ -88,15 +87,9 @@ cd_set_environment_variables () { *) cd_error_os "CD_OS_VERSION" ;; esac ;; - "${CD_OS_FEDORA}") - case "${CD_OS_VERSION}" in - "39"|"40") ;; - *) cd_error_os "CD_OS_VERSION" ;; - esac - ;; "${CD_OS_UBUNTU}") case "${CD_OS_VERSION}" in - "jammy"|"noble") ;; + "mantic"|"noble") ;; *) cd_error_os "CD_OS_VERSION" ;; esac ;; @@ -109,7 +102,7 @@ cd_set_environment_variables () { cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" # shared case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") + "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") CD_CA_ROOT="/etc/pki/ca-trust/source/anchors" CD_CMD_CA="update-ca-trust" ;; @@ -126,7 +119,7 @@ cd_set_environment_variables () { cd_echo "CD_CA_ROOT" "CD_CMD_CA" # common case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") + "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") CD_CMD_CLEAN="dnf clean all" CD_CMD_INSTALL="dnf install --assumeyes" CD_CMD_QUERY="rpm --query" @@ -169,8 +162,8 @@ skip_if_unavailable=False CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" - CD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" - CD_PM_HTTPS_TEXT="SSLVerify = No" + # TODO + # TODO ;; "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") CD_CMD_CLEAN="apt-get clean" @@ -205,15 +198,9 @@ Dir::Etc::SourceParts \"\"; "${CD_OS_ALPINE}") CD_URL_DEFAULT="https://dl-cdn.alpinelinux.org/alpine" ;; - "${CD_OS_ARCH}") - CD_URL_DEFAULT="https://geo.mirror.pkgbuild.com" - ;; "${CD_OS_DEBIAN}") CD_URL_DEFAULT="http://deb.debian.org/debian" ;; - "${CD_OS_FEDORA}") - CD_URL_DEFAULT="http://download.example/pub/fedora/linux/releases" - ;; "${CD_OS_ROCKY}") CD_URL_DEFAULT="http://dl.rockylinux.org/\$contentdir" ;; @@ -233,10 +220,6 @@ Dir::Etc::SourceParts \"\"; [ "${CD_URL_DEBIAN}" ] && CD_URL_CHOSEN="${CD_URL_DEBIAN}" \ || CD_URL_CHOSEN="https://deb.debian.org/debian" ;; - "${CD_OS_FEDORA}") - [ "${CD_URL_FEDORA}" ] && CD_URL_CHOSEN="${CD_URL_FEDORA}" \ - || CD_URL_CHOSEN="https://rpmfind.net/linux/fedora/linux/releases" - ;; "${CD_OS_ROCKY}") [ "${CD_URL_ROCKY}" ] && CD_URL_CHOSEN="${CD_URL_ROCKY}" \ || CD_URL_CHOSEN="https://dl.rockylinux.org/\$contentdir" @@ -253,14 +236,17 @@ Dir::Etc::SourceParts \"\"; "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3.11" + CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" ;; "${CD_OS_ALPINE}") CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3" + CD_PYTHON_PACKAGES="/usr/lib/python3.11/site-packages" ;; "${CD_OS_ARCH}") CD_PYTHON_COMMAND="python3.12" CD_PYTHON_PACKAGE="python" + CD_PYTHON_PACKAGES="/usr/lib/python3.12/site-packages" ;; "${CD_OS_DEBIAN}") case "${CD_OS_VERSION}" in @@ -268,27 +254,14 @@ Dir::Etc::SourceParts \"\"; "bullseye") CD_PYTHON_COMMAND="python3.9" ;; esac CD_PYTHON_PACKAGE="python3" - ;; - "${CD_OS_FEDORA}") - CD_PYTHON_COMMAND="python3.12" - CD_PYTHON_PACKAGE="python3" + CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; "${CD_OS_UBUNTU}") case "${CD_OS_VERSION}" in "noble") CD_PYTHON_COMMAND="python3.12" ;; - "jammy") CD_PYTHON_COMMAND="python3.10" ;; + "mantic") CD_PYTHON_COMMAND="python3.11" ;; esac CD_PYTHON_PACKAGE="python3" - ;; - esac - case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") - CD_PYTHON_PACKAGES="/usr/lib64/${CD_PYTHON_COMMAND}/site-packages" - ;; - "${CD_OS_ALPINE}"|"${CD_OS_ARCH}") - CD_PYTHON_PACKAGES="/usr/lib/${CD_PYTHON_COMMAND}/site-packages" - ;; - "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; esac @@ -661,7 +634,6 @@ CD_OS_ALMA="alma" CD_OS_ALPINE="alpine" CD_OS_ARCH="arch" CD_OS_DEBIAN="debian" -CD_OS_FEDORA="fedora" CD_OS_ROCKY="rocky" CD_OS_UBUNTU="ubuntu" diff --git a/readme.md b/readme.md index 0f0cca5..f9d0d44 100644 --- a/readme.md +++ b/readme.md @@ -13,27 +13,28 @@ from various CA, CI, OCI / OS. * [X] GitLab * [ ] SourceHut * [ ] Operating Systems - * [X] Alma → Python 3.11 + * [X] Alma * [X] 8 * [X] 9 - * [X] Alpine → Python 3.11 + * [X] Alpine * [X] 3.18 * [X] 3.19 - * [ ] Arch → Python 3.12 + * [ ] Arch * [ ] 20231112 * [ ] 20240101 * [X] Debian - * [X] Bullseye (11) → Python 3.9 - * [X] Bookworm (12) → Python 3.11 - * [ ] Fedora → Python 3.12 - * [ ] 39 - * [ ] 40 - * [X] Rocky → Python 3.11 + * [X] Bookworm + * [X] Bullseye + * [X] Rocky * [X] 8 * [X] 9 * [X] Ubuntu - * [X] Jammy (22.04) → Python 3.10 - * [X] Noble (24.04) → Python 3.12 + * [X] Mantic + * [X] Noble +* [X] Python + * [X] 3.9 (Debian Bullseye) + * [X] 3.11 (Alma, Alpine, Debian Bookworm, Rocky, Ubuntu Mantic) + * [X] 3.12 (Arch, Ubuntu Noble) ## How @@ -45,7 +46,6 @@ from various CA, CI, OCI / OS. | CD_URL_ALPINE | Alpine repository URL | | CD_URL_ARCH | Arch repository URL | | CD_URL_DEBIAN | Debian repository URL | -| CD_URL_FEDORA | Fedora repository URL | | CD_URL_ROCKY | Rocky repository URL | | CD_URL_UBUNTU | Ubuntu repository URL |