From c29a4d3c3c2561093587a8385c9b2a2e887a1904 Mon Sep 17 00:00:00 2001 From: Jack Luo <8986643+jackluo923@users.noreply.github.com> Date: Tue, 1 Sep 2026 04:40:36 -0400 Subject: [PATCH] ci!: Remove CentOS Stream 9 platform support CentOS Stream 9 is no longer a supported platform: - Delete the centos-stream-9 deps-image and binaries jobs, its paths-filter output, and deps-cache-key fragment from clp-artifact-build.yaml; relocate the deps-cache YAML anchors into the manylinux_2_28-x86_64-binaries job. - Delete tools/docker-images/clp-env-base-centos-stream-9/ and tools/scripts/lib_install/centos-stream-9/. - Remove the /etc/centos-release static-linking guard from components/core/CMakeLists.txt (AlmaLinux/manylinux_2_28 behavior unchanged). - Remove the CentOS CA-bundle fallback from CurlDownloadHandler; CA discovery still honors CURL_CA_BUNDLE/SSL_CERT_FILE and the Debian default path, and distro libcurl defaults cover RHEL-family hosts. - Remove the centos-stream-9 docs page, its toctree/link entries, the dependencies-image docs section, and related workflow docs. --- .github/workflows/clp-artifact-build.yaml | 136 ++---------------- components/core/CMakeLists.txt | 10 -- .../core/src/clp/CurlDownloadHandler.cpp | 4 - .../core/src/clp/CurlDownloadHandler.hpp | 1 - .../clp-env-base-centos-stream-9/Dockerfile | 70 --------- .../clp-env-base-centos-stream-9/build.sh | 27 ---- .../scripts/corporate-proxy-container.sh | 4 +- .../tools/scripts/corporate-proxy-host.sh | 4 +- .../centos-stream-9/install-all.sh | 10 -- .../install-packages-from-source.sh | 10 -- .../install-prebuilt-packages.sh | 29 ---- .../centos-stream-9-deps-install.md | 24 ---- docs/src/dev-docs/components-core/index.md | 2 - docs/src/dev-docs/tooling-containers.md | 21 +-- docs/src/dev-docs/tooling-gh-workflows.md | 7 - 15 files changed, 15 insertions(+), 344 deletions(-) delete mode 100644 components/core/tools/docker-images/clp-env-base-centos-stream-9/Dockerfile delete mode 100755 components/core/tools/docker-images/clp-env-base-centos-stream-9/build.sh delete mode 100755 components/core/tools/scripts/lib_install/centos-stream-9/install-all.sh delete mode 100755 components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh delete mode 100755 components/core/tools/scripts/lib_install/centos-stream-9/install-prebuilt-packages.sh delete mode 100644 docs/src/dev-docs/components-core/centos-stream-9-deps-install.md diff --git a/.github/workflows/clp-artifact-build.yaml b/.github/workflows/clp-artifact-build.yaml index 20fdfe407e..8b46734ea3 100644 --- a/.github/workflows/clp-artifact-build.yaml +++ b/.github/workflows/clp-artifact-build.yaml @@ -42,12 +42,6 @@ jobs: }} outputs: # Container-image outputs - centos_stream_9_image_changed: "${{steps.filter.outputs.centos_stream_9_image}}" - centos_stream_9_publish_image: >- - ${{steps.calc_workflow_triggers.outputs.is_push_or_run_on_main}} - centos_stream_9_use_published_image: >- - ${{steps.filter.outputs.centos_stream_9_image == 'false' - || steps.calc_workflow_triggers.outputs.is_push_or_run_on_main == 'true'}} manylinux_2_28_image_changed: "${{steps.filter.outputs.manylinux_2_28_image}}" manylinux_2_28_publish_image: >- ${{steps.calc_workflow_triggers.outputs.is_push_or_run_on_main}} @@ -110,10 +104,6 @@ jobs: - "components/core/tools/scripts/corporate-proxy-host.sh" - "components/core/tools/scripts/lib_install/*.sh" - "components/core/tools/scripts/lib_install/pipx-packages/**" - centos_stream_9_image: - - *_deps_images_common_paths - - "components/core/tools/docker-images/clp-env-base-centos-stream-9/**" - - "components/core/tools/scripts/lib_install/centos-stream-9/**" manylinux_2_28_image: - *_deps_images_common_paths - "components/core/tools/docker-images/clp-env-base-manylinux_2_28/**" @@ -151,31 +141,6 @@ jobs: - ".gitmodules" - "integration-tests/**" - centos-stream-9-deps-image: - name: "centos-stream-9-deps-image" - if: "needs.calc-build-triggers.outputs.centos_stream_9_image_changed == 'true'" - needs: "calc-build-triggers" - runs-on: *runner - steps: - - uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2 - with: - submodules: "recursive" - - - name: "Work around actions/runner-images/issues/6775" - run: "chown $(id -u):$(id -g) -R ." - shell: "bash" - - - uses: "./.github/actions/clp-core-build-containers" - env: - OS_NAME: "centos-stream-9" - with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" - docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ - /Dockerfile" - push_deps_image: "${{needs.calc-build-triggers.outputs.centos_stream_9_publish_image}}" - token: "${{secrets.GITHUB_TOKEN}}" - manylinux_2_28-deps-image: name: "manylinux_2_28-${{matrix.arch}}-deps-image" if: "needs.calc-build-triggers.outputs.manylinux_2_28_image_changed == 'true'" @@ -362,95 +327,6 @@ jobs: push_deps_image: "${{needs.calc-build-triggers.outputs.ubuntu_jammy_publish_image}}" token: "${{secrets.GITHUB_TOKEN}}" - centos-stream-9-binaries: - # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. - if: >- - success() - || (!cancelled() && !failure() && needs.calc-build-triggers.outputs.clp_changed == 'true') - needs: - - "calc-build-triggers" - - "centos-stream-9-deps-image" - strategy: - matrix: - use_shared_libs: [true, false] - name: "centos-stream-9-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" - continue-on-error: true - runs-on: *runner - steps: - - uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2 - with: - submodules: "recursive" - - - name: "Work around actions/runner-images/issues/6775" - run: "chown $(id -u):$(id -g) -R ." - shell: "bash" - - - id: "deps_image" - uses: "./.github/actions/prepare-image" - env: - OS_NAME: "centos-stream-9" - with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" - use_published_image: >- - ${{needs.calc-build-triggers.outputs.centos_stream_9_use_published_image}} - - - id: "deps_cache_key" - uses: "./.github/actions/deps-cache-key" - with: - os_name: "centos-stream-9" - env_hash: "${{steps.deps_image.outputs.image_id}}" - - # NOTE: Restoring after the `chown` above avoids chowning the restored tree (~2.3GB). - - name: "Restore deps:core cache" - id: "deps_cache_restore" - uses: "actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9" # v6.1.0 - with: - # `.task` must travel with the tree, or `clean-outdated-cpp-checksum-files` wipes the - # restored checksums. A `!` exclusion can't prune anything here (`implicitDescendants: - # false`), so large paths are deleted before the save instead. - path: &deps_cache_paths |- - build/deps/cpp - .task - key: "${{steps.deps_cache_key.outputs.key}}" - - - uses: "./.github/actions/run-on-image" - env: - OS_NAME: "centos-stream-9" - with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" - use_published_image: >- - ${{needs.calc-build-triggers.outputs.centos_stream_9_use_published_image}} - prepared_image_id: "${{steps.deps_image.outputs.image_id}}" - run_command: >- - CLP_CPP_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core - && touch /mnt/repo/build/.deps-core-ok - && python3 /mnt/repo/components/core/tools/scripts/utils/build-and-run-unit-tests.py - ${{matrix.use_shared_libs == true && '--use-shared-libs' || ''}} - --source-dir /mnt/repo/components/core - --build-dir /mnt/repo/components/core/build - --num-jobs $(getconf _NPROCESSORS_ONLN) - - # `mongocxx` clones `mongo-c-driver` to build it. It needs the checked-out source, but not - # the `.git` directory the clone brings with it -- dropping that before the save takes - # ~200MB off the cache entry. - - name: "Drop mongo-c-driver's .git directory before caching" - if: &deps_cache_save_condition >- - !cancelled() - && false == matrix.use_shared_libs - && '' != hashFiles('build/.deps-core-ok') - && 'true' != steps.deps_cache_restore.outputs.cache-hit - && 'pull_request' != github.event_name - && 'refs/heads/main' == github.ref - run: "rm -rf build/deps/cpp/mongocxx-build/_deps/mongo-c-driver-src/.git" - shell: "bash" - - - name: "Update deps:core cache" - if: *deps_cache_save_condition - uses: "actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9" # v6.1.0 - with: - path: *deps_cache_paths - key: "${{steps.deps_cache_key.outputs.key}}" - manylinux_2_28-x86_64-binaries: # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. if: >- @@ -499,7 +375,9 @@ jobs: id: "deps_cache_restore" uses: "actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9" # v6.1.0 with: - path: *deps_cache_paths + path: &deps_cache_paths |- + build/deps/cpp + .task key: "${{steps.deps_cache_key.outputs.key}}" - uses: "./.github/actions/run-on-image" @@ -521,7 +399,13 @@ jobs: --num-jobs $(getconf _NPROCESSORS_ONLN) - name: "Drop mongo-c-driver's .git directory before caching" - if: *deps_cache_save_condition + if: &deps_cache_save_condition >- + !cancelled() + && false == matrix.use_shared_libs + && '' != hashFiles('build/.deps-core-ok') + && 'true' != steps.deps_cache_restore.outputs.cache-hit + && 'pull_request' != github.event_name + && 'refs/heads/main' == github.ref run: "rm -rf build/deps/cpp/mongocxx-build/_deps/mongo-c-driver-src/.git" shell: "bash" diff --git a/components/core/CMakeLists.txt b/components/core/CMakeLists.txt index 6c49b58d6f..288640d5a5 100644 --- a/components/core/CMakeLists.txt +++ b/components/core/CMakeLists.txt @@ -84,16 +84,6 @@ set(CLP_USE_STATIC_LIBS ON CACHE BOOL "Whether to link against static libraries" if (CLP_USE_STATIC_LIBS) if (APPLE) set(CLP_STATIC_LIBS_UNSUPPORTED_PLATFORM "macOS") - elseif (EXISTS "/etc/centos-release") - # NOTE: - # 1. We don't support static linking on any CentOS-based distro except manylinux_2_28 (which - # shows up as "AlmaLinux"). - # 2. A release called "AlmaLinux" doesn't guarantee we're running on a manylinux distro, but - # we can improve this check when someone reports an issue. - file(READ "/etc/centos-release" CENTOS_RELEASE_CONTENT) - if(NOT "${CENTOS_RELEASE_CONTENT}" MATCHES "AlmaLinux") - set(CLP_STATIC_LIBS_UNSUPPORTED_PLATFORM "CentOS") - endif() endif() if (DEFINED CLP_STATIC_LIBS_UNSUPPORTED_PLATFORM) diff --git a/components/core/src/clp/CurlDownloadHandler.cpp b/components/core/src/clp/CurlDownloadHandler.cpp index f580051aa7..1b7254f266 100644 --- a/components/core/src/clp/CurlDownloadHandler.cpp +++ b/components/core/src/clp/CurlDownloadHandler.cpp @@ -132,7 +132,6 @@ auto CurlDownloadHandler::get_host_ca_bundle_path() -> std::optional std::optional ./build.sh -# CentOS Stream 9 repos use metalink= (not mirrorlist=) and have no commented baseurl, -# so we comment out metalink and add baseurl lines for each enabled repo section. -ARG DNF_MIRROR_BASE_URL -RUN if [ -n "${DNF_MIRROR_BASE_URL:-}" ]; then \ - sed -i 's|^metalink=|#metalink=|g' /etc/yum.repos.d/centos.repo && \ - sed -i '/^\[baseos\]$/a baseurl='"${DNF_MIRROR_BASE_URL}"'/9-stream/BaseOS/$basearch/os/' /etc/yum.repos.d/centos.repo && \ - sed -i '/^\[appstream\]$/a baseurl='"${DNF_MIRROR_BASE_URL}"'/9-stream/AppStream/$basearch/os/' /etc/yum.repos.d/centos.repo && \ - sed -i '/^\[crb\]$/a baseurl='"${DNF_MIRROR_BASE_URL}"'/9-stream/CRB/$basearch/os/' /etc/yum.repos.d/centos.repo && \ - dnf clean all && dnf makecache; \ - fi - -# Set pipx environment vars so that the pipx scripts install into the global locations without -# passing the `--global` flag. -ENV PIPX_BIN_DIR=/usr/local/bin -ENV PIPX_HOME=/opt/pipx - -RUN ./tools/scripts/lib_install/centos-stream-9/install-all.sh || { \ - echo ""; \ - echo "==============================================================="; \ - echo "ERROR: Package installation failed."; \ - echo ""; \ - echo "If the error above mentions download failures, timeouts, or"; \ - echo "unreachable mirrors, try overriding with a different mirror:"; \ - echo " DNF_MIRROR_BASE_URL= ./build.sh"; \ - echo ""; \ - echo "Use your organization's internal mirror or pick one from:"; \ - echo " https://www.centos.org/download/mirrors/"; \ - echo "==============================================================="; \ - exit 1; \ - } - -# Remove cached files -RUN dnf clean all \ - && rm -rf /tmp/* /var/tmp/* - -# Flatten the image -FROM scratch -COPY --link --from=base / / -ENV CURL_CA_BUNDLE=/opt/corp-ca/ca-bundle.crt \ - PIP_CERT=/opt/corp-ca/ca-bundle.crt \ - REQUESTS_CA_BUNDLE=/opt/corp-ca/ca-bundle.crt \ - SSL_CERT_FILE=/opt/corp-ca/ca-bundle.crt -ENV PIPX_BIN_DIR=/usr/local/bin -ENV PIPX_HOME=/opt/pipx diff --git a/components/core/tools/docker-images/clp-env-base-centos-stream-9/build.sh b/components/core/tools/docker-images/clp-env-base-centos-stream-9/build.sh deleted file mode 100755 index 325b9c80e2..0000000000 --- a/components/core/tools/docker-images/clp-env-base-centos-stream-9/build.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o nounset -set -o pipefail - -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -component_root="${script_dir}/../../../" - -# Corporate proxy support — see corporate-proxy-host.sh for details. -source "${script_dir}/../../scripts/corporate-proxy-host.sh" -prepare_ca_cert_for_build "$component_root" -trap 'cleanup_ca_cert "$component_root"' EXIT - -build_cmd=( - docker build - --tag clp-core-dependencies-x86-centos-stream-9:dev - "$component_root" - --file "${script_dir}/Dockerfile" -) - -# Optional env vars: -# HTTP_PROXY / HTTPS_PROXY / NO_PROXY / ALL_PROXY — Forwarded into the build container -# DNF_MIRROR_BASE_URL — Override CentOS Stream mirrors (organization-internal or regional) -# DOCKER_NETWORK — Override Docker network mode (auto: host for localhost proxies) -# DOCKER_PULL=true — Force pull the latest base image from the registry -finalize_build build_cmd "$script_dir" DNF_MIRROR_BASE_URL diff --git a/components/core/tools/scripts/corporate-proxy-container.sh b/components/core/tools/scripts/corporate-proxy-container.sh index 114bf8e315..4519e5664c 100755 --- a/components/core/tools/scripts/corporate-proxy-container.sh +++ b/components/core/tools/scripts/corporate-proxy-container.sh @@ -23,7 +23,7 @@ # is an error — it means the build was invoked without proper CA setup. # # Supports: -# - DNF-based (manylinux_2_28, centos-stream-9) +# - DNF-based (manylinux_2_28) # - APK/APT-based (musllinux_1_2, ubuntu-jammy) # # CA bundle path used by tools (via env vars in the Dockerfile): @@ -60,7 +60,7 @@ echo "corporate-proxy-container: installing CA certificates..." cp "$ca_cert" "${corp_ca_bundle}" if [[ -d /etc/pki/tls/certs ]]; then - # RHEL/CentOS/manylinux: also copy to the system bundle for tools that + # RHEL/manylinux: also copy to the system bundle for tools that # don't use env vars. cp "$ca_cert" "/etc/pki/tls/certs/ca-bundle.crt" echo "corporate-proxy-container: installed CA bundle (RHEL/manylinux)." diff --git a/components/core/tools/scripts/corporate-proxy-host.sh b/components/core/tools/scripts/corporate-proxy-host.sh index 65935ef4f4..3bec75bee4 100755 --- a/components/core/tools/scripts/corporate-proxy-host.sh +++ b/components/core/tools/scripts/corporate-proxy-host.sh @@ -25,7 +25,7 @@ detect_ca_bundle() { local ca_paths=( "${SSL_CERT_FILE:-}" # User/corporate override /etc/ssl/certs/ca-certificates.crt # Debian/Ubuntu/Alpine - /etc/pki/tls/certs/ca-bundle.crt # RHEL/CentOS/Fedora + /etc/pki/tls/certs/ca-bundle.crt # RHEL/Fedora /etc/ssl/cert.pem # macOS ) @@ -61,7 +61,7 @@ prepare_ca_cert_for_build() { echo >&2 "ERROR: No CA certificate bundle found on host." echo >&2 " Expected one of:" echo >&2 " /etc/ssl/certs/ca-certificates.crt (Debian/Ubuntu/Alpine)" - echo >&2 " /etc/pki/tls/certs/ca-bundle.crt (RHEL/CentOS)" + echo >&2 " /etc/pki/tls/certs/ca-bundle.crt (RHEL)" echo >&2 " /etc/ssl/cert.pem (macOS)" exit 1 fi diff --git a/components/core/tools/scripts/lib_install/centos-stream-9/install-all.sh b/components/core/tools/scripts/lib_install/centos-stream-9/install-all.sh deleted file mode 100755 index b24c2b96ba..0000000000 --- a/components/core/tools/scripts/lib_install/centos-stream-9/install-all.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o nounset -set -o pipefail - -script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" - -"${script_dir}/install-prebuilt-packages.sh" -"${script_dir}/install-packages-from-source.sh" diff --git a/components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh b/components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh deleted file mode 100755 index 356ea9f87b..0000000000 --- a/components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o nounset -set -o pipefail - -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -lib_install_scripts_dir="${script_dir}/.." - -"${lib_install_scripts_dir}/liblzma.sh" 5.8.1 diff --git a/components/core/tools/scripts/lib_install/centos-stream-9/install-prebuilt-packages.sh b/components/core/tools/scripts/lib_install/centos-stream-9/install-prebuilt-packages.sh deleted file mode 100755 index fa56074a58..0000000000 --- a/components/core/tools/scripts/lib_install/centos-stream-9/install-prebuilt-packages.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o nounset -set -o pipefail - -dnf install -y \ - diffutils \ - gcc-c++ \ - git \ - java-11-openjdk \ - jq \ - libarchive-devel \ - libcurl-devel \ - libzstd-devel \ - lz4-devel \ - make \ - mariadb-connector-c-devel \ - openssl-devel \ - python3-pip \ - unzip - -if ! command -v pipx >/dev/null 2>&1; then - python3 -m pip install pipx -fi - -# Install remaining packages through pipx -script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" -"${script_dir}/../pipx-packages/install-all.sh" diff --git a/docs/src/dev-docs/components-core/centos-stream-9-deps-install.md b/docs/src/dev-docs/components-core/centos-stream-9-deps-install.md deleted file mode 100644 index 5ca104bd84..0000000000 --- a/docs/src/dev-docs/components-core/centos-stream-9-deps-install.md +++ /dev/null @@ -1,24 +0,0 @@ -# Centos Stream 9 setup - -To install the dependencies required to build clp-core, follow the steps below. -These same steps are used by our Docker containers. - -## Installing dependencies - -:::{caution} -Before you run any commands below, you should review the scripts to ensure they will not install -any dependencies or apply any configurations that you don't expect. -::: - -To install all dependencies, run the following with elevated privileges: - -:::{note} -The packages built from source ([install-packages-from-source.sh][src-install-script]) are installed -without using a packager. So if you ever need to uninstall them, you will need to do so manually. -::: - -```shell -components/core/tools/scripts/lib_install/centos-stream-9/install-all.sh -``` - -[src-install-script]: https://github.com/y-scope/clp/blob/DOCS_VAR_CLP_GIT_REF/components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh diff --git a/docs/src/dev-docs/components-core/index.md b/docs/src/dev-docs/components-core/index.md index 3e83ba9dc4..6858af7462 100644 --- a/docs/src/dev-docs/components-core/index.md +++ b/docs/src/dev-docs/components-core/index.md @@ -74,7 +74,6 @@ A handful of packages and libraries are required to build CLP. There are two opt See the relevant README for your OS: -* [CentOS Stream 9](centos-stream-9-deps-install) * [macOS](macos-deps-install) * [Ubuntu 22.04](ubuntu-jammy-deps-install) @@ -127,7 +126,6 @@ task tests:integration:core :::{toctree} :hidden: -centos-stream-9-deps-install macos-deps-install ubuntu-jammy-deps-install regex-utils diff --git a/docs/src/dev-docs/tooling-containers.md b/docs/src/dev-docs/tooling-containers.md index bf3a97af7e..cdefd0541d 100644 --- a/docs/src/dev-docs/tooling-containers.md +++ b/docs/src/dev-docs/tooling-containers.md @@ -73,24 +73,6 @@ other distros using musl 1.2, including: `clp-core-dependencies-x86-musllinux_1_2:dev` for amd64 and `clp-core-dependencies-aarch64-musllinux_1_2:dev` for arm64. -## clp-core-dependencies-x86-centos-stream-9 - -An image containing the dependencies necessary to build CLP core in a CentOS Stream 9 x86 -environment. - -* [GitHub Packages page][core-deps-centos-stream-9] -* Pull command: - - ```bash - docker pull ghcr.io/y-scope/clp/clp-core-dependencies-x86-centos-stream-9:main - ``` - -* Path: - - ```text - components/core/tools/docker-images/clp-env-base-centos-stream-9 - ``` - ## clp-core-dependencies-x86-ubuntu-jammy An image containing the dependencies necessary to build CLP core in an Ubuntu Jammy x86 @@ -214,7 +196,7 @@ Each distro supports an environment variable to override the default package mir | Variable | Distro | Example | |-----------------------|---------------------------------------------|------------------------------------------| -| `DNF_MIRROR_BASE_URL` | manylinux_2_28 (AlmaLinux), centos-stream-9 | `https://internal.example.com/almalinux` | +| `DNF_MIRROR_BASE_URL` | manylinux_2_28 (AlmaLinux) | `https://internal.example.com/almalinux` | | `APK_MIRROR_URL` | musllinux_1_2 (Alpine) | `https://internal.example.com/alpine` | | `APT_MIRROR_URL` | ubuntu-jammy | `https://internal.example.com/ubuntu` | @@ -225,7 +207,6 @@ Each distro supports an environment variable to override the default package mir | `DOCKER_PULL` | `true` | Pull the latest base image before building. Set to `false` for offline builds. | | `DOCKER_NETWORK` | (auto) | Override Docker's network mode (e.g., `host`, `bridge`). | -[core-deps-centos-stream-9]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-dependencies-x86-centos-stream-9 [core-deps-manylinux_2_28]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-dependencies-manylinux_2_28 [core-deps-musllinux_1_2]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-dependencies-musllinux_1_2 [core-deps-ubuntu-jammy]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-dependencies-x86-ubuntu-jammy diff --git a/docs/src/dev-docs/tooling-gh-workflows.md b/docs/src/dev-docs/tooling-gh-workflows.md index 64cc7f39d5..7230e8dea0 100644 --- a/docs/src/dev-docs/tooling-gh-workflows.md +++ b/docs/src/dev-docs/tooling-gh-workflows.md @@ -29,15 +29,12 @@ shown below. } }%% flowchart LR - calc-build-triggers --> centos-stream-9-deps-image calc-build-triggers --> manylinux_2_28-deps-image calc-build-triggers --> musllinux_1_2-deps-image calc-build-triggers --> ubuntu-jammy-deps-image - calc-build-triggers --> centos-stream-9-binaries calc-build-triggers --> manylinux_2_28-x86_64-binaries calc-build-triggers --> musllinux_1_2-x86_64-binaries calc-build-triggers --> ubuntu-jammy-binaries - centos-stream-9-deps-image --> centos-stream-9-binaries manylinux_2_28-deps-image --> manylinux_2_28-deps-image-merge manylinux_2_28-deps-image --> manylinux_2_28-x86_64-binaries manylinux_2_28-deps-image-merge --> manylinux_2_28-x86_64-binaries @@ -55,8 +52,6 @@ Arrows between jobs indicate a dependency. The jobs are as follows: * `calc-build-triggers`: Analyzes the changes in the pull request or commit to determine which of the following jobs should run, which container images should be published, and which of the following jobs should use a published image. -* `centos-stream-9-deps-image`: Builds a container image containing the dependencies necessary to - build CLP-core in a CentOS Stream 9 x86 environment. * `manylinux_2_28-deps-image`: A matrix job that builds, for each of amd64 and arm64 natively on its matching runner, a container image containing the dependencies necessary to build CLP-core in a manylinux_2_28 environment. On push to `main`, each arch is published under an @@ -71,8 +66,6 @@ Arrows between jobs indicate a dependency. The jobs are as follows: `musllinux_1_2-deps-image` into a single multi-arch `:main` manifest. * `ubuntu-jammy-deps-image`: Builds a container image containing the dependencies necessary to build CLP-core in an Ubuntu Jammy x86 environment. -* `centos-stream-9-binaries`: Builds the CLP-core binaries in the built CentOS Stream 9 container - and runs core's unit tests. * `manylinux_2_28-x86_64-binaries`: Builds the CLP-core binaries in the built manylinux_2_28 container and runs core's unit tests. * `musllinux_1_2-x86_64-binaries`: Builds the CLP-core binaries in the built musllinux_1_2 container