From b399eeaf7142dd80b8da0d9e527b95ce0f0064db Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 10:07:02 +0200 Subject: [PATCH 01/10] readme/fedora --- readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readme.md b/readme.md index f9d0d44..0ec7612 100644 --- a/readme.md +++ b/readme.md @@ -25,6 +25,9 @@ from various CA, CI, OCI / OS. * [X] Debian * [X] Bookworm * [X] Bullseye + * [ ] Fedora + * [ ] 39 + * [ ] 40 * [X] Rocky * [X] 8 * [X] 9 From 2bf74aab112b3cba9b9b6d22a7dd85d9e08c158e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 11:36:27 +0200 Subject: [PATCH 02/10] fedora/wip --- cd.sh | 26 +++++++++++++++++++++++--- readme.md | 3 ++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index a1b2398..69d4f12 100644 --- a/cd.sh +++ b/cd.sh @@ -45,12 +45,13 @@ 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_ROCKY}") + "${CD_OS_ALMA}"|"${CD_OS_ARCH}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") CD_OS_VERSION=$(cd_grep_os VERSION_ID \ | sed "s|^\([0-9]\+\)\..*|\1|") ;; @@ -87,6 +88,12 @@ 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 "mantic"|"noble") ;; @@ -102,7 +109,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_ROCKY}") + "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") CD_CA_ROOT="/etc/pki/ca-trust/source/anchors" CD_CMD_CA="update-ca-trust" ;; @@ -119,7 +126,7 @@ cd_set_environment_variables () { cd_echo "CD_CA_ROOT" "CD_CMD_CA" # common case "${CD_OS_ID}" in - "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") + "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") CD_CMD_CLEAN="dnf clean all" CD_CMD_INSTALL="dnf install --assumeyes" CD_CMD_QUERY="rpm --query" @@ -201,6 +208,9 @@ Dir::Etc::SourceParts \"\"; "${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" ;; @@ -220,6 +230,10 @@ 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" @@ -256,6 +270,11 @@ Dir::Etc::SourceParts \"\"; CD_PYTHON_PACKAGE="python3" CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; + "${CD_OS_FEDORA}") + CD_PYTHON_COMMAND="python3.12" + CD_PYTHON_PACKAGE="python3" + CD_PYTHON_PACKAGES="/usr/lib64/python3.12/site-packages" + ;; "${CD_OS_UBUNTU}") case "${CD_OS_VERSION}" in "noble") CD_PYTHON_COMMAND="python3.12" ;; @@ -634,6 +653,7 @@ 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 0ec7612..1fbd687 100644 --- a/readme.md +++ b/readme.md @@ -37,7 +37,7 @@ from various CA, CI, OCI / OS. * [X] Python * [X] 3.9 (Debian Bullseye) * [X] 3.11 (Alma, Alpine, Debian Bookworm, Rocky, Ubuntu Mantic) - * [X] 3.12 (Arch, Ubuntu Noble) + * [X] 3.12 (Arch, Fedora, Ubuntu Noble) ## How @@ -49,6 +49,7 @@ 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 | From 61093c5710f004217409bdb35ca9e2d0ab5ec7be Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 11:37:37 +0200 Subject: [PATCH 03/10] fedora/workflows --- .forgejo/workflows/fedora:39.yaml | 13 +++++++++++++ .forgejo/workflows/fedora:40.yaml | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .forgejo/workflows/fedora:39.yaml create mode 100644 .forgejo/workflows/fedora:40.yaml diff --git a/.forgejo/workflows/fedora:39.yaml b/.forgejo/workflows/fedora:39.yaml new file mode 100644 index 0000000..0f0a195 --- /dev/null +++ b/.forgejo/workflows/fedora:39.yaml @@ -0,0 +1,13 @@ +on: [push] +jobs: + job: + container: + image: fedora:39 + 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:40.yaml b/.forgejo/workflows/fedora:40.yaml new file mode 100644 index 0000000..beb2f0d --- /dev/null +++ b/.forgejo/workflows/fedora:40.yaml @@ -0,0 +1,13 @@ +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 From 79939a09e6df5116d49af7bd1469bf5ecc401f9e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 11:45:21 +0200 Subject: [PATCH 04/10] pypackages --- cd.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cd.sh b/cd.sh index 69d4f12..4f96e18 100644 --- a/cd.sh +++ b/cd.sh @@ -250,17 +250,14 @@ 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,12 +265,10 @@ Dir::Etc::SourceParts \"\"; "bullseye") CD_PYTHON_COMMAND="python3.9" ;; esac CD_PYTHON_PACKAGE="python3" - CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; "${CD_OS_FEDORA}") CD_PYTHON_COMMAND="python3.12" CD_PYTHON_PACKAGE="python3" - CD_PYTHON_PACKAGES="/usr/lib64/python3.12/site-packages" ;; "${CD_OS_UBUNTU}") case "${CD_OS_VERSION}" in @@ -281,6 +276,16 @@ Dir::Etc::SourceParts \"\"; "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 From 9827544da46456ea0acbd54309446011329d2cac Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 11:50:31 +0200 Subject: [PATCH 05/10] readme/python --- readme.md | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/readme.md b/readme.md index 1fbd687..7776539 100644 --- a/readme.md +++ b/readme.md @@ -13,31 +13,27 @@ from various CA, CI, OCI / OS. * [X] GitLab * [ ] SourceHut * [ ] Operating Systems - * [X] Alma + * [X] Alma → Python 3.11 * [X] 8 * [X] 9 - * [X] Alpine + * [X] Alpine → Python 3.11 * [X] 3.18 * [X] 3.19 - * [ ] Arch + * [ ] Arch → Python 3.12 * [ ] 20231112 * [ ] 20240101 * [X] Debian - * [X] Bookworm - * [X] Bullseye - * [ ] Fedora + * [X] Bullseye (11) → Python 3.9 + * [X] Bookworm (12) → Python 3.11 + * [ ] Fedora → Python 3.12 * [ ] 39 * [ ] 40 - * [X] Rocky + * [X] Rocky → Python 3.11 * [X] 8 * [X] 9 * [X] Ubuntu - * [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, Fedora, Ubuntu Noble) + * [X] Mantic (23.10) → Python 3.11 + * [X] Noble (24.04) → Python 3.12 ## How From 01de021c693f4ec0b724f7cb48cc81bc2bf01db8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 11:52:37 +0200 Subject: [PATCH 06/10] ubuntu/workflows --- .forgejo/workflows/{ubuntu:mantic.yaml => ubuntu:jammy.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .forgejo/workflows/{ubuntu:mantic.yaml => ubuntu:jammy.yaml} (87%) diff --git a/.forgejo/workflows/ubuntu:mantic.yaml b/.forgejo/workflows/ubuntu:jammy.yaml similarity index 87% rename from .forgejo/workflows/ubuntu:mantic.yaml rename to .forgejo/workflows/ubuntu:jammy.yaml index 4dc9767..ac3ce6d 100644 --- a/.forgejo/workflows/ubuntu:mantic.yaml +++ b/.forgejo/workflows/ubuntu:jammy.yaml @@ -2,7 +2,7 @@ on: [push] jobs: job: container: - image: ubuntu:mantic + image: ubuntu:jammy steps: - name: cd env: From d63ad0db7d3a7ffa4f0c3d93e7ed268fb974487d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 11:55:00 +0200 Subject: [PATCH 07/10] ubuntu/readme --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 7776539..0f0cca5 100644 --- a/readme.md +++ b/readme.md @@ -32,7 +32,7 @@ from various CA, CI, OCI / OS. * [X] 8 * [X] 9 * [X] Ubuntu - * [X] Mantic (23.10) → Python 3.11 + * [X] Jammy (22.04) → Python 3.10 * [X] Noble (24.04) → Python 3.12 ## How From 4a87d29c682d5c3ff7c2ff796a58131101f47e8f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 11:56:45 +0200 Subject: [PATCH 08/10] ubuntu/versions --- cd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 4f96e18..3afeefb 100644 --- a/cd.sh +++ b/cd.sh @@ -96,7 +96,7 @@ cd_set_environment_variables () { ;; "${CD_OS_UBUNTU}") case "${CD_OS_VERSION}" in - "mantic"|"noble") ;; + "jammy"|"noble") ;; *) cd_error_os "CD_OS_VERSION" ;; esac ;; @@ -273,7 +273,7 @@ Dir::Etc::SourceParts \"\"; "${CD_OS_UBUNTU}") case "${CD_OS_VERSION}" in "noble") CD_PYTHON_COMMAND="python3.12" ;; - "mantic") CD_PYTHON_COMMAND="python3.11" ;; + "jammy") CD_PYTHON_COMMAND="python3.10" ;; esac CD_PYTHON_PACKAGE="python3" ;; From ffab53c4e0f270478b45d19bb528866cdc15b526 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 12:11:40 +0200 Subject: [PATCH 09/10] arch/https --- cd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 3afeefb..79a9791 100644 --- a/cd.sh +++ b/cd.sh @@ -169,8 +169,8 @@ skip_if_unavailable=False CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" - # TODO - # TODO + CD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" + CD_PM_HTTPS_TEXT="SSLVerify = No" ;; "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") CD_CMD_CLEAN="apt-get clean" From aa4f0f67caee7c322cc1da9c52ce9e7fdf793dbd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 13:42:33 +0200 Subject: [PATCH 10/10] arch/default --- cd.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cd.sh b/cd.sh index 79a9791..48830dc 100644 --- a/cd.sh +++ b/cd.sh @@ -205,6 +205,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" ;;