From acc4a62fa0387c62acd6a4b7ff83d6bf6e7ff81c Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Sun, 24 Aug 2025 15:19:11 -0400 Subject: [PATCH 01/21] Add manylinux deps image build --- .github/workflows/clp-core-build.yaml | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 6a04c11798..0cb3177277 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -76,6 +76,18 @@ jobs: - "components/core/tools/scripts/lib_install/*.sh" - "components/core/tools/docker-images/clp-env-base-centos-stream-9/**" - "components/core/tools/scripts/lib_install/centos-stream-9/**" + manylinux_2_28_image: + - ".github/actions/**" + - ".github/workflows/clp-core-build.yaml" + - "components/core/tools/scripts/lib_install/*.sh" + - "components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/**" + - "components/core/tools/scripts/lib_install/manylinux_2_28/**" + musllinux_1_2_image: + - ".github/actions/**" + - ".github/workflows/clp-core-build.yaml" + - "components/core/tools/scripts/lib_install/*.sh" + - "components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/**" + - "components/core/tools/scripts/lib_install/musllinux_1_2/**" ubuntu_jammy_image: - ".github/actions/**" - ".github/workflows/clp-core-build.yaml" @@ -121,6 +133,32 @@ jobs: ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} token: "${{secrets.GITHUB_TOKEN}}" + manylinux-2-28-deps-image: + name: "manylinux-2-28-deps-image" + if: "needs.filter-relevant-changes.outputs.manylinux_2_28_image_changed == 'true'" + needs: "filter-relevant-changes" + runs-on: "ubuntu-24.04" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + 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: "manylinux_2_28" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + docker_context: "components/core" + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + /Dockerfile" + push_deps_image: >- + ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} + token: "${{secrets.GITHUB_TOKEN}}" + ubuntu-jammy-deps-image: name: "ubuntu-jammy-deps-image" if: "needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'true'" From 81d679903420932e0523032ad9f94a91ea42c97a Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Sun, 24 Aug 2025 15:34:08 -0400 Subject: [PATCH 02/21] Small fix --- .../tools/scripts/lib_install/manylinux_2_28/install-all.sh | 3 +-- .../lib_install/manylinux_2_28/install-prebuilt-packages.sh | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh b/components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh index 089cd6bc66..f834003b7c 100755 --- a/components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh +++ b/components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash -set -eu -set -o pipefail +set -euo pipefail script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" diff --git a/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh b/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh index 57ea2caab0..875540ebe6 100755 --- a/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh +++ b/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh @@ -41,5 +41,6 @@ dnf install --assumeyes "$task_pkg_path" rm "$task_pkg_path" # Downgrade to CMake v3 to work around https://github.com/y-scope/clp/issues/795 -pipx uninstall cmake -pipx install cmake~=3.31 +if ! command -v cmake ; then + pipx install cmake~=3.31 +fi From bdb75bb31d838e06573f9f53803bf4e85df17a08 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Sun, 24 Aug 2025 15:48:44 -0400 Subject: [PATCH 03/21] Create filter outputs --- .github/workflows/clp-core-build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 0cb3177277..e47d506881 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -45,6 +45,8 @@ jobs: runs-on: "ubuntu-24.04" outputs: centos_stream_9_image_changed: "${{steps.filter.outputs.centos_stream_9_image}}" + manylinux_2_28_image_changed: "${{steps.filter.outputs.manylinux_2_28_image}}" + musllinux_1_2_image_changed: "${{steps.filter.outputs.musllinux_1_2_image}}" ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}" clp_changed: "${{steps.filter.outputs.clp}}" steps: From 373d43f4eee8ebc01a06afaa05d20c189373accb Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Sun, 24 Aug 2025 16:04:07 -0400 Subject: [PATCH 04/21] Update docker dir --- .github/workflows/clp-core-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index e47d506881..34aa1e5579 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -155,7 +155,7 @@ jobs: with: image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-x86_64\ /Dockerfile" push_deps_image: >- ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} From 7f8706e42c49d4d94e1fc375ee80db9a0bbb6796 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 00:49:08 -0400 Subject: [PATCH 05/21] Fix cmake version --- .../manylinux_2_28/install-prebuilt-packages.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh b/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh index 875540ebe6..6cde2fef18 100755 --- a/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh +++ b/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh @@ -40,7 +40,9 @@ curl \ dnf install --assumeyes "$task_pkg_path" rm "$task_pkg_path" -# Downgrade to CMake v3 to work around https://github.com/y-scope/clp/issues/795 -if ! command -v cmake ; then - pipx install cmake~=3.31 +# Install CMake v3.31.x as ANTLR and yaml-cpp do not yet support CMake v4+. +# See also: https://github.com/y-scope/clp/issues/795 +if command -v cmake ; then + pipx uninstall cmake fi +pipx install "cmake~=3.31" From 39d7abb138dd7f2010031a2b6f730657eb5dcc13 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 01:13:57 -0400 Subject: [PATCH 06/21] Add remaining workflows --- .github/workflows/clp-core-build.yaml | 104 ++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 34aa1e5579..abdb1d7661 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -161,6 +161,32 @@ jobs: ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} token: "${{secrets.GITHUB_TOKEN}}" + musllinux-1-2-deps-image: + name: "musllinux-1-2-deps-image" + if: "needs.filter-relevant-changes.outputs.musllinux_1_2_image_changed == 'true'" + needs: "filter-relevant-changes" + runs-on: "ubuntu-24.04" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + 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: "musllinux_1_2" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + docker_context: "components/core" + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-x86_64\ + /Dockerfile" + push_deps_image: >- + ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} + token: "${{secrets.GITHUB_TOKEN}}" + ubuntu-jammy-deps-image: name: "ubuntu-jammy-deps-image" if: "needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'true'" @@ -226,6 +252,84 @@ jobs: --build-dir /mnt/repo/components/core/build --num-jobs $(getconf _NPROCESSORS_ONLN) + manylinux-2-28-binaries: + # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. + if: >- + success() + || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') + needs: + - "manylinux-2-28-deps-image" + - "filter-relevant-changes" + strategy: + matrix: + use_shared_libs: [true, false] + name: "manylinux-2-28-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" + continue-on-error: true + runs-on: "ubuntu-24.04" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + with: + submodules: "recursive" + + - name: "Work around actions/runner-images/issues/6775" + run: "chown $(id -u):$(id -g) -R ." + shell: "bash" + + - uses: "./.github/actions/run-on-image" + env: + OS_NAME: "manylinux_2_28" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + use_published_image: >- + ${{needs.filter-relevant-changes.outputs.manylinux_2_28_image_changed == 'false' + || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} + run_command: >- + CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core + && 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) + + musllinux-1-2-binaries: + # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. + if: >- + success() + || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') + needs: + - "musllinux-1-2-deps-image" + - "filter-relevant-changes" + strategy: + matrix: + use_shared_libs: [true, false] + name: "musllinux-1-2-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" + continue-on-error: true + runs-on: "ubuntu-24.04" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + with: + submodules: "recursive" + + - name: "Work around actions/runner-images/issues/6775" + run: "chown $(id -u):$(id -g) -R ." + shell: "bash" + + - uses: "./.github/actions/run-on-image" + env: + OS_NAME: "musllinux_1_2" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + use_published_image: >- + ${{needs.filter-relevant-changes.outputs.musllinux_1_2_image_changed == 'false' + || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} + run_command: >- + CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core + && 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) + ubuntu-jammy-binaries: # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. if: >- From 916a4b62144196e67b762ac7246b6ef8eec62809 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 01:37:28 -0400 Subject: [PATCH 07/21] Remove unrelated changes --- .../scripts/lib_install/manylinux_2_28/install-all.sh | 3 ++- .../manylinux_2_28/install-prebuilt-packages.sh | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh b/components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh index f834003b7c..089cd6bc66 100755 --- a/components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh +++ b/components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -euo pipefail +set -eu +set -o pipefail script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" diff --git a/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh b/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh index 6cde2fef18..57ea2caab0 100755 --- a/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh +++ b/components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh @@ -40,9 +40,6 @@ curl \ dnf install --assumeyes "$task_pkg_path" rm "$task_pkg_path" -# Install CMake v3.31.x as ANTLR and yaml-cpp do not yet support CMake v4+. -# See also: https://github.com/y-scope/clp/issues/795 -if command -v cmake ; then - pipx uninstall cmake -fi -pipx install "cmake~=3.31" +# Downgrade to CMake v3 to work around https://github.com/y-scope/clp/issues/795 +pipx uninstall cmake +pipx install cmake~=3.31 From 06a902031d15ae93d86c5e37f3fac0da0f001a1b Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 02:06:52 -0400 Subject: [PATCH 08/21] Update docs --- docs/src/dev-guide/components-core/index.md | 4 ++++ .../manylinux-2-28-deps-install.md | 24 +++++++++++++++++++ .../musllinux-1-2-deps-install.md | 24 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 docs/src/dev-guide/components-core/manylinux-2-28-deps-install.md create mode 100644 docs/src/dev-guide/components-core/musllinux-1-2-deps-install.md diff --git a/docs/src/dev-guide/components-core/index.md b/docs/src/dev-guide/components-core/index.md index 272fcc0269..c8905189e1 100644 --- a/docs/src/dev-guide/components-core/index.md +++ b/docs/src/dev-guide/components-core/index.md @@ -70,6 +70,8 @@ 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) +* [Manylinux 2.28](manylinux-2-28-deps-install) +* [Musllinux 1.2](musllinux-1-2-deps-install) * [macOS](macos-deps-install) * [Ubuntu 22.04](ubuntu-jammy-deps-install) @@ -113,6 +115,8 @@ the relevant paths on your machine. :hidden: centos-stream-9-deps-install +manylinux-2-28-deps-install +musllinux-1-2-deps-install macos-deps-install ubuntu-jammy-deps-install regex-utils diff --git a/docs/src/dev-guide/components-core/manylinux-2-28-deps-install.md b/docs/src/dev-guide/components-core/manylinux-2-28-deps-install.md new file mode 100644 index 0000000000..dc7dd99d7d --- /dev/null +++ b/docs/src/dev-guide/components-core/manylinux-2-28-deps-install.md @@ -0,0 +1,24 @@ +# Manylinux 2.28 + +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/manylinux_2_28/install-all.sh +``` + +[src-install-script]: https://github.com/y-scope/clp/blob/main/components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh diff --git a/docs/src/dev-guide/components-core/musllinux-1-2-deps-install.md b/docs/src/dev-guide/components-core/musllinux-1-2-deps-install.md new file mode 100644 index 0000000000..fda0370ad6 --- /dev/null +++ b/docs/src/dev-guide/components-core/musllinux-1-2-deps-install.md @@ -0,0 +1,24 @@ +# Musllinux 1.2 + +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/musllinux_1_2/install-all.sh +``` + +[src-install-script]: https://github.com/y-scope/clp/blob/main/components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh From b6f143671cc0178a4b5e4ace4670193922da9733 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 03:50:41 -0400 Subject: [PATCH 09/21] Add manylinux arm64 deps img workflow --- .github/workflows/clp-core-build.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index abdb1d7661..a0c4b4d253 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -135,6 +135,32 @@ jobs: ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} token: "${{secrets.GITHUB_TOKEN}}" + manylinux-2-28-aarch64-deps-image: + name: "manylinux-2-28-aarch64-deps-image" + if: "needs.filter-relevant-changes.outputs.manylinux_2_28_image_changed == 'true'" + needs: "filter-relevant-changes" + runs-on: "ubuntu-24.04-arm" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + 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: "manylinux_2_28-aarch64" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + docker_context: "components/core" + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + /Dockerfile" + push_deps_image: >- + ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} + token: "${{secrets.GITHUB_TOKEN}}" + manylinux-2-28-deps-image: name: "manylinux-2-28-deps-image" if: "needs.filter-relevant-changes.outputs.manylinux_2_28_image_changed == 'true'" From 93bee22e1a0fc46d74303270ed56871e7655e2a1 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 04:47:16 -0400 Subject: [PATCH 10/21] Add both x86_64 and arm64 versions for two platforms --- .github/workflows/clp-core-build.yaml | 180 ++++++++++++++++++++++---- 1 file changed, 153 insertions(+), 27 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index a0c4b4d253..d3d18365d5 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -45,8 +45,10 @@ jobs: runs-on: "ubuntu-24.04" outputs: centos_stream_9_image_changed: "${{steps.filter.outputs.centos_stream_9_image}}" - manylinux_2_28_image_changed: "${{steps.filter.outputs.manylinux_2_28_image}}" - musllinux_1_2_image_changed: "${{steps.filter.outputs.musllinux_1_2_image}}" + manylinux_2_28_aarch64_image_changed: "${{steps.filter.outputs.manylinux_2_28_aarch64_image}}" + manylinux_2_28_x86_64_image_changed: "${{steps.filter.outputs.manylinux_2_28_x86_64_image}}" + musllinux_1_2_aarch64_image_changed: "${{steps.filter.outputs.musllinux_1_2_aarch64_image}}" + musllinux_1_2_x86_64_image_changed: "${{steps.filter.outputs.musllinux_1_2_x86_64_image}}" ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}" clp_changed: "${{steps.filter.outputs.clp}}" steps: @@ -78,13 +80,25 @@ jobs: - "components/core/tools/scripts/lib_install/*.sh" - "components/core/tools/docker-images/clp-env-base-centos-stream-9/**" - "components/core/tools/scripts/lib_install/centos-stream-9/**" - manylinux_2_28_image: + manylinux_2_28_aarch64_image: + - ".github/actions/**" + - ".github/workflows/clp-core-build.yaml" + - "components/core/tools/scripts/lib_install/*.sh" + - "components/core/tools/docker-images/clp-env-base-manylinux_2_28-aarch64/**" + - "components/core/tools/scripts/lib_install/manylinux_2_28/**" + manylinux_2_28_x86_64_image: - ".github/actions/**" - ".github/workflows/clp-core-build.yaml" - "components/core/tools/scripts/lib_install/*.sh" - "components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/**" + musllinux_1_2_aarch64_image: + - ".github/actions/**" + - ".github/workflows/clp-core-build.yaml" + - "components/core/tools/scripts/lib_install/*.sh" + - "components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/**" + - "components/core/tools/scripts/lib_install/musllinux_1_2/**" - "components/core/tools/scripts/lib_install/manylinux_2_28/**" - musllinux_1_2_image: + musllinux_1_2_x86_64_image: - ".github/actions/**" - ".github/workflows/clp-core-build.yaml" - "components/core/tools/scripts/lib_install/*.sh" @@ -135,9 +149,9 @@ jobs: ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} token: "${{secrets.GITHUB_TOKEN}}" - manylinux-2-28-aarch64-deps-image: - name: "manylinux-2-28-aarch64-deps-image" - if: "needs.filter-relevant-changes.outputs.manylinux_2_28_image_changed == 'true'" + manylinux_2_28-aarch64-deps-image: + name: "manylinux_2_28-aarch64-deps-image" + if: "needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'true'" needs: "filter-relevant-changes" runs-on: "ubuntu-24.04-arm" steps: @@ -161,9 +175,9 @@ jobs: ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} token: "${{secrets.GITHUB_TOKEN}}" - manylinux-2-28-deps-image: - name: "manylinux-2-28-deps-image" - if: "needs.filter-relevant-changes.outputs.manylinux_2_28_image_changed == 'true'" + manylinux_2_28-x86_64-deps-image: + name: "manylinux_2_28-x86_64-deps-image" + if: "needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'true'" needs: "filter-relevant-changes" runs-on: "ubuntu-24.04" steps: @@ -177,19 +191,45 @@ jobs: - uses: "./.github/actions/clp-core-build-containers" env: - OS_NAME: "manylinux_2_28" + OS_NAME: "manylinux_2_28-x86_64" with: image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-x86_64\ + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" push_deps_image: >- ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} token: "${{secrets.GITHUB_TOKEN}}" - musllinux-1-2-deps-image: - name: "musllinux-1-2-deps-image" - if: "needs.filter-relevant-changes.outputs.musllinux_1_2_image_changed == 'true'" + musllinux_1_2-aarch64-deps-image: + name: "musllinux_1_2-aarch64-deps-image" + if: "needs.filter-relevant-changes.outputs.musllinux_1_2_aarch64_image_changed == 'true'" + needs: "filter-relevant-changes" + runs-on: "ubuntu-24.04-arm" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + 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: "musllinux_1_2-aarch64" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + docker_context: "components/core" + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + /Dockerfile" + push_deps_image: >- + ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} + token: "${{secrets.GITHUB_TOKEN}}" + + musllinux_1_2-x86_64-deps-image: + name: "musllinux_1_2-x86_64-deps-image" + if: "needs.filter-relevant-changes.outputs.musllinux_1_2_x86_64_image_changed == 'true'" needs: "filter-relevant-changes" runs-on: "ubuntu-24.04" steps: @@ -203,11 +243,11 @@ jobs: - uses: "./.github/actions/clp-core-build-containers" env: - OS_NAME: "musllinux_1_2" + OS_NAME: "musllinux_1_2-x86_64" with: image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-x86_64\ + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" push_deps_image: >- ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} @@ -278,18 +318,61 @@ jobs: --build-dir /mnt/repo/components/core/build --num-jobs $(getconf _NPROCESSORS_ONLN) - manylinux-2-28-binaries: + manylinux_2_28-aarch64-binaries: # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. if: >- success() || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') needs: - - "manylinux-2-28-deps-image" + - "manylinux_2_28-aarch64-deps-image" - "filter-relevant-changes" strategy: matrix: use_shared_libs: [true, false] - name: "manylinux-2-28-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" + name: >- + manylinux_2_28-aarch64-${{matrix.use_shared_libs == true && 'dynamic' || + 'static'}}-linked-bins + continue-on-error: true + runs-on: "ubuntu-24.04-arm" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + with: + submodules: "recursive" + + - name: "Work around actions/runner-images/issues/6775" + run: "chown $(id -u):$(id -g) -R ." + shell: "bash" + + - uses: "./.github/actions/run-on-image" + env: + OS_NAME: "manylinux_2_28-aarch64" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + use_published_image: >- + ${{needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'false' + || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} + run_command: >- + CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core + && 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) + + manylinux_2_28-x86_64-binaries: + # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. + if: >- + success() + || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') + needs: + - "manylinux_2_28-x86_64-deps-image" + - "filter-relevant-changes" + strategy: + matrix: + use_shared_libs: [true, false] + name: >- + manylinux_2_28-x86_64-${{matrix.use_shared_libs == true && 'dynamic' || + 'static'}}-linked-bins continue-on-error: true runs-on: "ubuntu-24.04" steps: @@ -303,11 +386,52 @@ jobs: - uses: "./.github/actions/run-on-image" env: - OS_NAME: "manylinux_2_28" + OS_NAME: "manylinux_2_28-x86_64" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + use_published_image: >- + ${{needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'false' + || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} + run_command: >- + CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core + && 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) + + musllinux_1_2-aarch64-binaries: + # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. + if: >- + success() + || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') + needs: + - "musllinux_1_2-aarch64-deps-image" + - "filter-relevant-changes" + strategy: + matrix: + use_shared_libs: [true, false] + name: >- + musllinux_1_2-aarch64-${{matrix.use_shared_libs == true && 'dynamic' || + 'static'}}-linked-bins + continue-on-error: true + runs-on: "ubuntu-24.04-arm" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + with: + submodules: "recursive" + + - name: "Work around actions/runner-images/issues/6775" + run: "chown $(id -u):$(id -g) -R ." + shell: "bash" + + - uses: "./.github/actions/run-on-image" + env: + OS_NAME: "musllinux_1_2-aarch64" with: image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- - ${{needs.filter-relevant-changes.outputs.manylinux_2_28_image_changed == 'false' + ${{needs.filter-relevant-changes.outputs.musllinux_1_2_aarch64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} run_command: >- CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core @@ -317,18 +441,20 @@ jobs: --build-dir /mnt/repo/components/core/build --num-jobs $(getconf _NPROCESSORS_ONLN) - musllinux-1-2-binaries: + musllinux_1_2-x86_64-binaries: # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. if: >- success() || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') needs: - - "musllinux-1-2-deps-image" + - "musllinux_1_2-x86_64-deps-image" - "filter-relevant-changes" strategy: matrix: use_shared_libs: [true, false] - name: "musllinux-1-2-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" + name: >- + musllinux_1_2-x86_64-${{matrix.use_shared_libs == true && 'dynamic' || + 'static'}}-linked-bins continue-on-error: true runs-on: "ubuntu-24.04" steps: @@ -342,11 +468,11 @@ jobs: - uses: "./.github/actions/run-on-image" env: - OS_NAME: "musllinux_1_2" + OS_NAME: "musllinux_1_2-x86_64" with: image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- - ${{needs.filter-relevant-changes.outputs.musllinux_1_2_image_changed == 'false' + ${{needs.filter-relevant-changes.outputs.musllinux_1_2_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} run_command: >- CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core From 22cfcccb30e2db70b634dd0759e1c3ce7ec3e961 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 04:50:56 -0400 Subject: [PATCH 11/21] fox --- .github/workflows/clp-core-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index d3d18365d5..f73139a221 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -91,13 +91,13 @@ jobs: - ".github/workflows/clp-core-build.yaml" - "components/core/tools/scripts/lib_install/*.sh" - "components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/**" + - "components/core/tools/scripts/lib_install/manylinux_2_28/**" musllinux_1_2_aarch64_image: - ".github/actions/**" - ".github/workflows/clp-core-build.yaml" - "components/core/tools/scripts/lib_install/*.sh" - "components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/**" - "components/core/tools/scripts/lib_install/musllinux_1_2/**" - - "components/core/tools/scripts/lib_install/manylinux_2_28/**" musllinux_1_2_x86_64_image: - ".github/actions/**" - ".github/workflows/clp-core-build.yaml" From 8adc4e6fbe8813fa14270c1eee20957b1cb9f132 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 05:28:12 -0400 Subject: [PATCH 12/21] use matrix --- .github/workflows/clp-core-build.yaml | 87 +++++++++------------------ 1 file changed, 27 insertions(+), 60 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index f73139a221..b575e2ace8 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -30,7 +30,8 @@ on: env: BINARIES_ARTIFACT_NAME_PREFIX: "clp-core-binaries-" - DEPS_IMAGE_NAME_PREFIX: "clp-core-dependencies-x86-" + DEPS_IMAGE_NAME_PREFIX_X86: "clp-core-dependencies-x86-" + DEPS_IMAGE_NAME_PREFIX_ARM: "clp-core-dependencies-arm-" concurrency: group: "${{github.workflow}}-${{github.ref}}" @@ -123,63 +124,29 @@ jobs: - "taskfiles/**" - "tools/scripts/deps-download/**" - centos-stream-9-deps-image: - name: "centos-stream-9-deps-image" - if: "needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'true'" - needs: "filter-relevant-changes" - runs-on: "ubuntu-24.04" - steps: - - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" - 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}}${{env.OS_NAME}}" - docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ - /Dockerfile" - push_deps_image: >- - ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} - token: "${{secrets.GITHUB_TOKEN}}" - - manylinux_2_28-aarch64-deps-image: - name: "manylinux_2_28-aarch64-deps-image" - if: "needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'true'" - needs: "filter-relevant-changes" - runs-on: "ubuntu-24.04-arm" - steps: - - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" - 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: "manylinux_2_28-aarch64" - with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" - docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ - /Dockerfile" - push_deps_image: >- - ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} - token: "${{secrets.GITHUB_TOKEN}}" - - manylinux_2_28-x86_64-deps-image: - name: "manylinux_2_28-x86_64-deps-image" - if: "needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'true'" + deps-image: + strategy: + fail-fast: false + matrix: + include: + - arch: "x86_64" + os_name: "centos-stream-9" + - arch: "aarch64" + os_name: "manylinux_2_28-aarch64" + - arch: "x86_64" + os_name: "manylinux_2_28-x86_64" + name: "${{ matrix.os_name }}-deps-image" + if: >- + ${{ + (matrix.os_name == 'centos-stream-9' && + needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'true') || + (matrix.os_name == 'manylinux_2_28-aarch64' && + needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'true') || + (matrix.os_name == 'manylinux_2_28-x86_64' && + needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'true') + }} needs: "filter-relevant-changes" - runs-on: "ubuntu-24.04" + runs-on: "${{ matrix.arch == 'x86_64' && ubuntu-24.04 || ubuntu-24.04-arm }}" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -190,10 +157,10 @@ jobs: shell: "bash" - uses: "./.github/actions/clp-core-build-containers" - env: - OS_NAME: "manylinux_2_28-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: >- + ${{matrix.arch == 'x86_64' && env.DEPS_IMAGE_NAME_PREFIX_X86 || + env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}} docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" From ff98538150da7acf592020877c02886a48423c4a Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 05:51:48 -0400 Subject: [PATCH 13/21] Update vars --- .github/workflows/clp-core-build.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index b575e2ace8..8a3dfa192d 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -186,7 +186,7 @@ jobs: env: OS_NAME: "musllinux_1_2-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" @@ -212,7 +212,7 @@ jobs: env: OS_NAME: "musllinux_1_2-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + 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" @@ -238,7 +238,7 @@ jobs: env: OS_NAME: "ubuntu-jammy" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + 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" @@ -273,7 +273,7 @@ jobs: env: OS_NAME: "centos-stream-9" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -314,7 +314,7 @@ jobs: env: OS_NAME: "manylinux_2_28-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -355,7 +355,7 @@ jobs: env: OS_NAME: "manylinux_2_28-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -396,7 +396,7 @@ jobs: env: OS_NAME: "musllinux_1_2-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.musllinux_1_2_aarch64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -437,7 +437,7 @@ jobs: env: OS_NAME: "musllinux_1_2-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.musllinux_1_2_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -480,7 +480,7 @@ jobs: - uses: "./.github/actions/run-on-image" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -614,7 +614,7 @@ jobs: env: OS_NAME: "ubuntu-jammy" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} From bff70646832837fdf335648c458626d9cbae2a16 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 05:59:04 -0400 Subject: [PATCH 14/21] Fix grammar --- .github/workflows/clp-core-build.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 8a3dfa192d..e0be79545c 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -146,7 +146,8 @@ jobs: needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'true') }} needs: "filter-relevant-changes" - runs-on: "${{ matrix.arch == 'x86_64' && ubuntu-24.04 || ubuntu-24.04-arm }}" + runs-on: >- + ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }} steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -160,10 +161,10 @@ jobs: with: image_name: >- ${{matrix.arch == 'x86_64' && env.DEPS_IMAGE_NAME_PREFIX_X86 || - env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}} + env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{matrix.os_name}} docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ - /Dockerfile" + docker_file: >- + components/core/tools/docker-images/clp-env-base-${{matrix.os_name}}/Dockerfile push_deps_image: >- ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} token: "${{secrets.GITHUB_TOKEN}}" @@ -252,7 +253,7 @@ jobs: success() || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') needs: - - "centos-stream-9-deps-image" + - "deps-image" - "filter-relevant-changes" strategy: matrix: @@ -291,7 +292,7 @@ jobs: success() || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') needs: - - "manylinux_2_28-aarch64-deps-image" + - "deps-image" - "filter-relevant-changes" strategy: matrix: @@ -332,7 +333,7 @@ jobs: success() || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') needs: - - "manylinux_2_28-x86_64-deps-image" + - "deps-image" - "filter-relevant-changes" strategy: matrix: From 6224601a30ed7433fef915961c4b5190288362a2 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 06:00:54 -0400 Subject: [PATCH 15/21] revert optimizations --- .github/workflows/clp-core-build.yaml | 118 ++++++++++++++++---------- 1 file changed, 75 insertions(+), 43 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index e0be79545c..f73139a221 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -30,8 +30,7 @@ on: env: BINARIES_ARTIFACT_NAME_PREFIX: "clp-core-binaries-" - DEPS_IMAGE_NAME_PREFIX_X86: "clp-core-dependencies-x86-" - DEPS_IMAGE_NAME_PREFIX_ARM: "clp-core-dependencies-arm-" + DEPS_IMAGE_NAME_PREFIX: "clp-core-dependencies-x86-" concurrency: group: "${{github.workflow}}-${{github.ref}}" @@ -124,30 +123,11 @@ jobs: - "taskfiles/**" - "tools/scripts/deps-download/**" - deps-image: - strategy: - fail-fast: false - matrix: - include: - - arch: "x86_64" - os_name: "centos-stream-9" - - arch: "aarch64" - os_name: "manylinux_2_28-aarch64" - - arch: "x86_64" - os_name: "manylinux_2_28-x86_64" - name: "${{ matrix.os_name }}-deps-image" - if: >- - ${{ - (matrix.os_name == 'centos-stream-9' && - needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'true') || - (matrix.os_name == 'manylinux_2_28-aarch64' && - needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'true') || - (matrix.os_name == 'manylinux_2_28-x86_64' && - needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'true') - }} + centos-stream-9-deps-image: + name: "centos-stream-9-deps-image" + if: "needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'true'" needs: "filter-relevant-changes" - runs-on: >- - ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }} + runs-on: "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -158,13 +138,65 @@ jobs: shell: "bash" - uses: "./.github/actions/clp-core-build-containers" + env: + OS_NAME: "centos-stream-9" with: - image_name: >- - ${{matrix.arch == 'x86_64' && env.DEPS_IMAGE_NAME_PREFIX_X86 || - env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{matrix.os_name}} + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" - docker_file: >- - components/core/tools/docker-images/clp-env-base-${{matrix.os_name}}/Dockerfile + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + /Dockerfile" + push_deps_image: >- + ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} + token: "${{secrets.GITHUB_TOKEN}}" + + manylinux_2_28-aarch64-deps-image: + name: "manylinux_2_28-aarch64-deps-image" + if: "needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'true'" + needs: "filter-relevant-changes" + runs-on: "ubuntu-24.04-arm" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + 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: "manylinux_2_28-aarch64" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + docker_context: "components/core" + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + /Dockerfile" + push_deps_image: >- + ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} + token: "${{secrets.GITHUB_TOKEN}}" + + manylinux_2_28-x86_64-deps-image: + name: "manylinux_2_28-x86_64-deps-image" + if: "needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'true'" + needs: "filter-relevant-changes" + runs-on: "ubuntu-24.04" + steps: + - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" + 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: "manylinux_2_28-x86_64" + with: + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + docker_context: "components/core" + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + /Dockerfile" push_deps_image: >- ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} token: "${{secrets.GITHUB_TOKEN}}" @@ -187,7 +219,7 @@ jobs: env: OS_NAME: "musllinux_1_2-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" @@ -213,7 +245,7 @@ jobs: env: OS_NAME: "musllinux_1_2-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" @@ -239,7 +271,7 @@ jobs: env: OS_NAME: "ubuntu-jammy" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" @@ -253,7 +285,7 @@ jobs: success() || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') needs: - - "deps-image" + - "centos-stream-9-deps-image" - "filter-relevant-changes" strategy: matrix: @@ -274,7 +306,7 @@ jobs: env: OS_NAME: "centos-stream-9" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -292,7 +324,7 @@ jobs: success() || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') needs: - - "deps-image" + - "manylinux_2_28-aarch64-deps-image" - "filter-relevant-changes" strategy: matrix: @@ -315,7 +347,7 @@ jobs: env: OS_NAME: "manylinux_2_28-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -333,7 +365,7 @@ jobs: success() || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') needs: - - "deps-image" + - "manylinux_2_28-x86_64-deps-image" - "filter-relevant-changes" strategy: matrix: @@ -356,7 +388,7 @@ jobs: env: OS_NAME: "manylinux_2_28-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -397,7 +429,7 @@ jobs: env: OS_NAME: "musllinux_1_2-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.musllinux_1_2_aarch64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -438,7 +470,7 @@ jobs: env: OS_NAME: "musllinux_1_2-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.musllinux_1_2_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -481,7 +513,7 @@ jobs: - uses: "./.github/actions/run-on-image" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -615,7 +647,7 @@ jobs: env: OS_NAME: "ubuntu-jammy" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} From 828e63467e9399e697758657e4dd2685130a8065 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 06:04:23 -0400 Subject: [PATCH 16/21] Fix image prefixes with arch type --- .github/workflows/clp-core-build.yaml | 29 ++++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index f73139a221..655ed6ea58 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -30,7 +30,8 @@ on: env: BINARIES_ARTIFACT_NAME_PREFIX: "clp-core-binaries-" - DEPS_IMAGE_NAME_PREFIX: "clp-core-dependencies-x86-" + DEPS_IMAGE_NAME_PREFIX_X86: "clp-core-dependencies-x86-" + DEPS_IMAGE_NAME_PREFIX_ARM: "clp-core-dependencies-arm-" concurrency: group: "${{github.workflow}}-${{github.ref}}" @@ -141,7 +142,7 @@ jobs: env: OS_NAME: "centos-stream-9" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + 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" @@ -167,7 +168,7 @@ jobs: env: OS_NAME: "manylinux_2_28-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" @@ -193,7 +194,7 @@ jobs: env: OS_NAME: "manylinux_2_28-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + 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" @@ -219,7 +220,7 @@ jobs: env: OS_NAME: "musllinux_1_2-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" @@ -245,7 +246,7 @@ jobs: env: OS_NAME: "musllinux_1_2-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + 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" @@ -271,7 +272,7 @@ jobs: env: OS_NAME: "ubuntu-jammy" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + 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" @@ -306,7 +307,7 @@ jobs: env: OS_NAME: "centos-stream-9" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -347,7 +348,7 @@ jobs: env: OS_NAME: "manylinux_2_28-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -388,7 +389,7 @@ jobs: env: OS_NAME: "manylinux_2_28-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -429,7 +430,7 @@ jobs: env: OS_NAME: "musllinux_1_2-aarch64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.musllinux_1_2_aarch64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -470,7 +471,7 @@ jobs: env: OS_NAME: "musllinux_1_2-x86_64" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.musllinux_1_2_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -513,7 +514,7 @@ jobs: - uses: "./.github/actions/run-on-image" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -647,7 +648,7 @@ jobs: env: OS_NAME: "ubuntu-jammy" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} From 386e5dcf472a538dccfa4c8b997f51cccd337c8d Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 06:04:57 -0400 Subject: [PATCH 17/21] Alphabeticize --- .github/workflows/clp-core-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 655ed6ea58..18f3cfc20a 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -30,8 +30,8 @@ on: env: BINARIES_ARTIFACT_NAME_PREFIX: "clp-core-binaries-" - DEPS_IMAGE_NAME_PREFIX_X86: "clp-core-dependencies-x86-" DEPS_IMAGE_NAME_PREFIX_ARM: "clp-core-dependencies-arm-" + DEPS_IMAGE_NAME_PREFIX_X86: "clp-core-dependencies-x86-" concurrency: group: "${{github.workflow}}-${{github.ref}}" From 6f5579b5a26be9fdd9fa9be3a53606b7838c9c1b Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 25 Aug 2025 06:15:29 -0400 Subject: [PATCH 18/21] Remove doc updates since manylinux and musllinux are not common OS platforms that people have access to --- docs/src/dev-guide/components-core/index.md | 21 +++++++--------- .../manylinux-2-28-deps-install.md | 24 ------------------- .../musllinux-1-2-deps-install.md | 24 ------------------- 3 files changed, 8 insertions(+), 61 deletions(-) delete mode 100644 docs/src/dev-guide/components-core/manylinux-2-28-deps-install.md delete mode 100644 docs/src/dev-guide/components-core/musllinux-1-2-deps-install.md diff --git a/docs/src/dev-guide/components-core/index.md b/docs/src/dev-guide/components-core/index.md index 048a46ec83..272fcc0269 100644 --- a/docs/src/dev-guide/components-core/index.md +++ b/docs/src/dev-guide/components-core/index.md @@ -38,23 +38,22 @@ The task will download, build, and install (within the build directory) the foll | [abseil-cpp](https://github.com/abseil/abseil-cpp) | 20250512.0 | | [ANTLR](https://www.antlr.org) | v4.13.2 | | [Boost](https://github.com/boostorg/boost) | v1.87.0 | -| [Catch2](https://github.com/catchorg/Catch2) | v3.8.0 | -| [date](https://github.com/HowardHinnant/date) | v3.0.1 | +| [Catch2](https://github.com/catchorg/Catch2.git) | v3.8.0 | +| [date](https://github.com/HowardHinnant/date.git) | v3.0.1 | | [fmt](https://github.com/fmtlib/fmt) | v10.2.1 | +| [json](https://github.com/nlohmann/json.git) | v3.11.3 | +| [log-surgeon](https://github.com/y-scope/log-surgeon) | f801a3f | | [liblzma](https://github.com/tukaani-project/xz) | v5.8.1 | -| [log-surgeon](https://github.com/y-scope/log-surgeon) | a82ad13 | | [lz4](https://github.com/lz4/lz4) | v1.10.0 | -| [microsoft.gsl](https://github.com/microsoft/GSL) | v4.0.0 | | [mongo-cxx-driver](https://github.com/mongodb/mongo-cxx-driver) | r3.10.2 | | [msgpack-cxx](https://github.com/msgpack/msgpack-c/tree/cpp_master) | v7.0.0 | -| [nlohmann_json](https://github.com/nlohmann/json) | v3.11.3 | | [simdjson](https://github.com/simdjson/simdjson) | v3.13.0 | | [spdlog](https://github.com/gabime/spdlog) | v1.14.1 | | [SQLite3](https://www.sqlite.org/download.html) | v3.36.0 | -| [utfcpp](https://github.com/nemtrif/utfcpp) | v4.0.6 | -| [yaml-cpp](https://github.com/jbeder/yaml-cpp) | v0.7.0 | -| [yscope-log-viewer](https://github.com/y-scope/yscope-log-viewer) | 3abe4cc | -| [ystdlib-cpp](https://github.com/y-scope/ystdlib-cpp) | d80cf86 | +| [uftcpp](https://github.com/nemtrif/utfcpp.git) | v4.0.6 | +| [yaml-cpp](https://github.com/jbeder/yaml-cpp.git) | v0.7.0 | +| [yscope-log-viewer](https://github.com/y-scope/yscope-log-viewer.git) | 969ff35 | +| [ystdlib-cpp](https://github.com/y-scope/ystdlib-cpp.git) | d80cf86 | | [zlib](https://github.com/madler/zlib) | v1.3.1 | | [zstd](https://github.com/facebook/zstd) | v1.5.7 | @@ -71,8 +70,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) -* [Manylinux 2.28](manylinux-2-28-deps-install) -* [Musllinux 1.2](musllinux-1-2-deps-install) * [macOS](macos-deps-install) * [Ubuntu 22.04](ubuntu-jammy-deps-install) @@ -116,8 +113,6 @@ the relevant paths on your machine. :hidden: centos-stream-9-deps-install -manylinux-2-28-deps-install -musllinux-1-2-deps-install macos-deps-install ubuntu-jammy-deps-install regex-utils diff --git a/docs/src/dev-guide/components-core/manylinux-2-28-deps-install.md b/docs/src/dev-guide/components-core/manylinux-2-28-deps-install.md deleted file mode 100644 index dc7dd99d7d..0000000000 --- a/docs/src/dev-guide/components-core/manylinux-2-28-deps-install.md +++ /dev/null @@ -1,24 +0,0 @@ -# Manylinux 2.28 - -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/manylinux_2_28/install-all.sh -``` - -[src-install-script]: https://github.com/y-scope/clp/blob/main/components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh diff --git a/docs/src/dev-guide/components-core/musllinux-1-2-deps-install.md b/docs/src/dev-guide/components-core/musllinux-1-2-deps-install.md deleted file mode 100644 index fda0370ad6..0000000000 --- a/docs/src/dev-guide/components-core/musllinux-1-2-deps-install.md +++ /dev/null @@ -1,24 +0,0 @@ -# Musllinux 1.2 - -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/musllinux_1_2/install-all.sh -``` - -[src-install-script]: https://github.com/y-scope/clp/blob/main/components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh From bc976fe68e6ef7e9d716be027fe129dc858e4791 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 26 Aug 2025 05:16:45 -0400 Subject: [PATCH 19/21] Add docs and remove aarch64 builds --- .github/workflows/clp-core-build.yaml | 181 ++------------------- docs/src/dev-guide/tooling-containers.md | 16 ++ docs/src/dev-guide/tooling-gh-workflows.md | 14 ++ 3 files changed, 46 insertions(+), 165 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 18f3cfc20a..bc3bc2f7d2 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -30,8 +30,7 @@ on: env: BINARIES_ARTIFACT_NAME_PREFIX: "clp-core-binaries-" - DEPS_IMAGE_NAME_PREFIX_ARM: "clp-core-dependencies-arm-" - DEPS_IMAGE_NAME_PREFIX_X86: "clp-core-dependencies-x86-" + DEPS_IMAGE_NAME_PREFIX: "clp-core-dependencies-x86-" concurrency: group: "${{github.workflow}}-${{github.ref}}" @@ -46,9 +45,7 @@ jobs: runs-on: "ubuntu-24.04" outputs: centos_stream_9_image_changed: "${{steps.filter.outputs.centos_stream_9_image}}" - manylinux_2_28_aarch64_image_changed: "${{steps.filter.outputs.manylinux_2_28_aarch64_image}}" manylinux_2_28_x86_64_image_changed: "${{steps.filter.outputs.manylinux_2_28_x86_64_image}}" - musllinux_1_2_aarch64_image_changed: "${{steps.filter.outputs.musllinux_1_2_aarch64_image}}" musllinux_1_2_x86_64_image_changed: "${{steps.filter.outputs.musllinux_1_2_x86_64_image}}" ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}" clp_changed: "${{steps.filter.outputs.clp}}" @@ -81,24 +78,12 @@ jobs: - "components/core/tools/scripts/lib_install/*.sh" - "components/core/tools/docker-images/clp-env-base-centos-stream-9/**" - "components/core/tools/scripts/lib_install/centos-stream-9/**" - manylinux_2_28_aarch64_image: - - ".github/actions/**" - - ".github/workflows/clp-core-build.yaml" - - "components/core/tools/scripts/lib_install/*.sh" - - "components/core/tools/docker-images/clp-env-base-manylinux_2_28-aarch64/**" - - "components/core/tools/scripts/lib_install/manylinux_2_28/**" manylinux_2_28_x86_64_image: - ".github/actions/**" - ".github/workflows/clp-core-build.yaml" - "components/core/tools/scripts/lib_install/*.sh" - "components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/**" - "components/core/tools/scripts/lib_install/manylinux_2_28/**" - musllinux_1_2_aarch64_image: - - ".github/actions/**" - - ".github/workflows/clp-core-build.yaml" - - "components/core/tools/scripts/lib_install/*.sh" - - "components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/**" - - "components/core/tools/scripts/lib_install/musllinux_1_2/**" musllinux_1_2_x86_64_image: - ".github/actions/**" - ".github/workflows/clp-core-build.yaml" @@ -142,33 +127,7 @@ jobs: 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: >- - ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} - token: "${{secrets.GITHUB_TOKEN}}" - - manylinux_2_28-aarch64-deps-image: - name: "manylinux_2_28-aarch64-deps-image" - if: "needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'true'" - needs: "filter-relevant-changes" - runs-on: "ubuntu-24.04-arm" - steps: - - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" - 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: "manylinux_2_28-aarch64" - with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" @@ -192,37 +151,11 @@ jobs: - uses: "./.github/actions/clp-core-build-containers" env: - OS_NAME: "manylinux_2_28-x86_64" + OS_NAME: "manylinux_2_28" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ - /Dockerfile" - push_deps_image: >- - ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} - token: "${{secrets.GITHUB_TOKEN}}" - - musllinux_1_2-aarch64-deps-image: - name: "musllinux_1_2-aarch64-deps-image" - if: "needs.filter-relevant-changes.outputs.musllinux_1_2_aarch64_image_changed == 'true'" - needs: "filter-relevant-changes" - runs-on: "ubuntu-24.04-arm" - steps: - - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" - 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: "musllinux_1_2-aarch64" - with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" - docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-x86_64\ /Dockerfile" push_deps_image: >- ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} @@ -244,11 +177,11 @@ jobs: - uses: "./.github/actions/clp-core-build-containers" env: - OS_NAME: "musllinux_1_2-x86_64" + OS_NAME: "musllinux_1_2" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" - docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ + docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-x86_64\ /Dockerfile" push_deps_image: >- ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}} @@ -272,7 +205,7 @@ jobs: env: OS_NAME: "ubuntu-jammy" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" docker_context: "components/core" docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\ /Dockerfile" @@ -307,7 +240,7 @@ jobs: env: OS_NAME: "centos-stream-9" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -319,47 +252,6 @@ jobs: --build-dir /mnt/repo/components/core/build --num-jobs $(getconf _NPROCESSORS_ONLN) - manylinux_2_28-aarch64-binaries: - # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. - if: >- - success() - || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') - needs: - - "manylinux_2_28-aarch64-deps-image" - - "filter-relevant-changes" - strategy: - matrix: - use_shared_libs: [true, false] - name: >- - manylinux_2_28-aarch64-${{matrix.use_shared_libs == true && 'dynamic' || - 'static'}}-linked-bins - continue-on-error: true - runs-on: "ubuntu-24.04-arm" - steps: - - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" - with: - submodules: "recursive" - - - name: "Work around actions/runner-images/issues/6775" - run: "chown $(id -u):$(id -g) -R ." - shell: "bash" - - - uses: "./.github/actions/run-on-image" - env: - OS_NAME: "manylinux_2_28-aarch64" - with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" - use_published_image: >- - ${{needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'false' - || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} - run_command: >- - CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core - && 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) - manylinux_2_28-x86_64-binaries: # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. if: >- @@ -387,9 +279,9 @@ jobs: - uses: "./.github/actions/run-on-image" env: - OS_NAME: "manylinux_2_28-x86_64" + OS_NAME: "manylinux_2_28" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -401,47 +293,6 @@ jobs: --build-dir /mnt/repo/components/core/build --num-jobs $(getconf _NPROCESSORS_ONLN) - musllinux_1_2-aarch64-binaries: - # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. - if: >- - success() - || (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true') - needs: - - "musllinux_1_2-aarch64-deps-image" - - "filter-relevant-changes" - strategy: - matrix: - use_shared_libs: [true, false] - name: >- - musllinux_1_2-aarch64-${{matrix.use_shared_libs == true && 'dynamic' || - 'static'}}-linked-bins - continue-on-error: true - runs-on: "ubuntu-24.04-arm" - steps: - - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" - with: - submodules: "recursive" - - - name: "Work around actions/runner-images/issues/6775" - run: "chown $(id -u):$(id -g) -R ." - shell: "bash" - - - uses: "./.github/actions/run-on-image" - env: - OS_NAME: "musllinux_1_2-aarch64" - with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_ARM}}${{env.OS_NAME}}" - use_published_image: >- - ${{needs.filter-relevant-changes.outputs.musllinux_1_2_aarch64_image_changed == 'false' - || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} - run_command: >- - CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core - && 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) - musllinux_1_2-x86_64-binaries: # Run if the ancestor jobs succeeded OR they were skipped and clp was changed. if: >- @@ -469,9 +320,9 @@ jobs: - uses: "./.github/actions/run-on-image" env: - OS_NAME: "musllinux_1_2-x86_64" + OS_NAME: "musllinux_1_2" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.musllinux_1_2_x86_64_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -514,7 +365,7 @@ jobs: - uses: "./.github/actions/run-on-image" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} @@ -648,7 +499,7 @@ jobs: env: OS_NAME: "ubuntu-jammy" with: - image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}" + image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}" use_published_image: >- ${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}} diff --git a/docs/src/dev-guide/tooling-containers.md b/docs/src/dev-guide/tooling-containers.md index fcef664133..36ee7664aa 100644 --- a/docs/src/dev-guide/tooling-containers.md +++ b/docs/src/dev-guide/tooling-containers.md @@ -29,6 +29,13 @@ distros using glibc 2.28+, including: ### clp-core-dependencies-x86-manylinux_2_28 +* [GitHub Packages page][core-deps-manylinux_2_28-x86_64] +* Pull command: + + ```bash + docker pull ghcr.io/y-scope/clp/clp-core-dependencies-x86-manylinux_2_28:main + ``` + * Path: ```text @@ -55,6 +62,13 @@ other distros using musl 1.2, including: ### clp-core-dependencies-x86-musllinux_1_2 +* [GitHub Packages page][core-deps-musllinux_1_2-x86_64] +* Pull command: + + ```bash + docker pull ghcr.io/y-scope/clp/clp-core-dependencies-x86-musllinux_1_2:main + ``` + * Path: ```text @@ -134,6 +148,8 @@ environment. ``` [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-x86_64]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-dependencies-x86-manylinux_2_28 +[core-deps-musllinux_1_2-x86_64]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-dependencies-x86-musllinux_1_2 [core-deps-ubuntu-jammy]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-dependencies-x86-ubuntu-jammy [core-ubuntu-jammy]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-x86-ubuntu-jammy [exe-ubuntu-jammy]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-execution-x86-ubuntu-jammy diff --git a/docs/src/dev-guide/tooling-gh-workflows.md b/docs/src/dev-guide/tooling-gh-workflows.md index bc38f75257..a66de10dfc 100644 --- a/docs/src/dev-guide/tooling-gh-workflows.md +++ b/docs/src/dev-guide/tooling-gh-workflows.md @@ -29,10 +29,16 @@ shown below. }%% flowchart TD filter-relevant-changes --> centos-stream-9-deps-image + filter-relevant-changes --> manylinux_2_28-x86_64-deps-image + filter-relevant-changes --> musllinux_1_2-x86_64-deps-image filter-relevant-changes --> ubuntu-jammy-deps-image filter-relevant-changes --> centos-stream-9-binaries + filter-relevant-changes --> manylinux_2_28-x86_64-binaries + filter-relevant-changes --> musllinux_1_2-x86_64-binaries filter-relevant-changes --> ubuntu-jammy-binaries centos-stream-9-deps-image --> centos-stream-9-binaries + manylinux_2_28-x86_64-deps-image --> manylinux_2_28-x86_64-binaries + musllinux_1_2-x86_64-deps-image --> musllinux_1_2-x86_64-binaries ubuntu-jammy-deps-image --> ubuntu-jammy-binaries ubuntu-jammy-binaries --> ubuntu-jammy-binaries-image ::: @@ -43,10 +49,18 @@ Arrows between jobs indicate a dependency. The jobs are as follows: the following jobs should run. * `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-x86_64-deps-image`: Builds a container image containing the dependencies necessary + to build CLP-core in a Manylinux 2.28 x86 environment. +* `musllinux_1_2-x86_64-deps-image`: Builds a container image containing the dependencies necessary + to build CLP-core in a Musllinux 1.2 x86 environment. * `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 + and runs core's unit tests. * `ubuntu-jammy-binaries`: Builds the CLP-core binaries in the built Ubuntu Jammy container and runs core's unit tests. * `ubuntu-jammy-binaries-image`: Builds an Ubuntu Jammy container image containing CLP-core's From 8d463fd2303f8aa9e42f8a4da0fd8c6061d9cfa9 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 26 Aug 2025 01:22:17 -0800 Subject: [PATCH 20/21] cleanup version changes --- docs/src/dev-guide/components-core/index.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/src/dev-guide/components-core/index.md b/docs/src/dev-guide/components-core/index.md index 272fcc0269..5cb964f521 100644 --- a/docs/src/dev-guide/components-core/index.md +++ b/docs/src/dev-guide/components-core/index.md @@ -38,22 +38,23 @@ The task will download, build, and install (within the build directory) the foll | [abseil-cpp](https://github.com/abseil/abseil-cpp) | 20250512.0 | | [ANTLR](https://www.antlr.org) | v4.13.2 | | [Boost](https://github.com/boostorg/boost) | v1.87.0 | -| [Catch2](https://github.com/catchorg/Catch2.git) | v3.8.0 | -| [date](https://github.com/HowardHinnant/date.git) | v3.0.1 | +| [Catch2](https://github.com/catchorg/Catch2) | v3.8.0 | +| [date](https://github.com/HowardHinnant/date) | v3.0.1 | | [fmt](https://github.com/fmtlib/fmt) | v10.2.1 | -| [json](https://github.com/nlohmann/json.git) | v3.11.3 | -| [log-surgeon](https://github.com/y-scope/log-surgeon) | f801a3f | | [liblzma](https://github.com/tukaani-project/xz) | v5.8.1 | +| [log-surgeon](https://github.com/y-scope/log-surgeon) | a82ad13 | | [lz4](https://github.com/lz4/lz4) | v1.10.0 | +| [microsoft.gsl](https://github.com/microsoft/GSL) | v4.0.0 | | [mongo-cxx-driver](https://github.com/mongodb/mongo-cxx-driver) | r3.10.2 | | [msgpack-cxx](https://github.com/msgpack/msgpack-c/tree/cpp_master) | v7.0.0 | +| [nlohmann_json](https://github.com/nlohmann/json) | v3.11.3 | | [simdjson](https://github.com/simdjson/simdjson) | v3.13.0 | | [spdlog](https://github.com/gabime/spdlog) | v1.14.1 | | [SQLite3](https://www.sqlite.org/download.html) | v3.36.0 | -| [uftcpp](https://github.com/nemtrif/utfcpp.git) | v4.0.6 | -| [yaml-cpp](https://github.com/jbeder/yaml-cpp.git) | v0.7.0 | -| [yscope-log-viewer](https://github.com/y-scope/yscope-log-viewer.git) | 969ff35 | -| [ystdlib-cpp](https://github.com/y-scope/ystdlib-cpp.git) | d80cf86 | +| [utfcpp](https://github.com/nemtrif/utfcpp) | v4.0.6 | +| [yaml-cpp](https://github.com/jbeder/yaml-cpp) | v0.7.0 | +| [yscope-log-viewer](https://github.com/y-scope/yscope-log-viewer) | 3abe4cc | +| [ystdlib-cpp](https://github.com/y-scope/ystdlib-cpp) | d80cf86 | | [zlib](https://github.com/madler/zlib) | v1.3.1 | | [zstd](https://github.com/facebook/zstd) | v1.5.7 | From d68ddba9a9fcb9f012d58c829860fa04f472f760 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Wed, 27 Aug 2025 09:22:17 +0800 Subject: [PATCH 21/21] Apply suggestions from code review Co-authored-by: kirkrodrigues <2454684+kirkrodrigues@users.noreply.github.com> --- .github/workflows/clp-core-build.yaml | 6 ++---- docs/src/dev-guide/tooling-gh-workflows.md | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index bc3bc2f7d2..4f29cec4f3 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -264,8 +264,7 @@ jobs: matrix: use_shared_libs: [true, false] name: >- - manylinux_2_28-x86_64-${{matrix.use_shared_libs == true && 'dynamic' || - 'static'}}-linked-bins + manylinux_2_28-x86_64-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins continue-on-error: true runs-on: "ubuntu-24.04" steps: @@ -305,8 +304,7 @@ jobs: matrix: use_shared_libs: [true, false] name: >- - musllinux_1_2-x86_64-${{matrix.use_shared_libs == true && 'dynamic' || - 'static'}}-linked-bins + musllinux_1_2-x86_64-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins continue-on-error: true runs-on: "ubuntu-24.04" steps: diff --git a/docs/src/dev-guide/tooling-gh-workflows.md b/docs/src/dev-guide/tooling-gh-workflows.md index a66de10dfc..7ac57344c0 100644 --- a/docs/src/dev-guide/tooling-gh-workflows.md +++ b/docs/src/dev-guide/tooling-gh-workflows.md @@ -27,7 +27,7 @@ shown below. } } }%% -flowchart TD +flowchart LR filter-relevant-changes --> centos-stream-9-deps-image filter-relevant-changes --> manylinux_2_28-x86_64-deps-image filter-relevant-changes --> musllinux_1_2-x86_64-deps-image @@ -50,16 +50,16 @@ Arrows between jobs indicate a dependency. The jobs are as follows: * `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-x86_64-deps-image`: Builds a container image containing the dependencies necessary - to build CLP-core in a Manylinux 2.28 x86 environment. + to build CLP-core in a manylinux_2_28 x86 environment. * `musllinux_1_2-x86_64-deps-image`: Builds a container image containing the dependencies necessary - to build CLP-core in a Musllinux 1.2 x86 environment. + to build CLP-core in a musllinux_1_2 x86 environment. * `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 +* `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 +* `musllinux_1_2-x86_64-binaries`: Builds the CLP-core binaries in the built musllinux_1_2 container and runs core's unit tests. * `ubuntu-jammy-binaries`: Builds the CLP-core binaries in the built Ubuntu Jammy container and runs core's unit tests.