Skip to content

Commit 4edace6

Browse files
committed
Addressed code-rabbit review points.
1 parent 9b14097 commit 4edace6

File tree

5 files changed

+45
-8
lines changed

5 files changed

+45
-8
lines changed

.github/workflows/clp-core-build.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,45 @@ jobs:
147147
${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}}
148148
token: "${{secrets.GITHUB_TOKEN}}"
149149

150+
manylinux_2_28-binaries:
151+
# Run if the ancestor jobs succeeded OR they were skipped and clp was changed.
152+
if: >-
153+
success()
154+
|| (!cancelled() && !failure() && needs.filter-relevant-changes.outputs.clp_changed == 'true')
155+
needs:
156+
- "centos-stream-9-deps-image"
157+
- "filter-relevant-changes"
158+
strategy:
159+
matrix:
160+
use_shared_libs: [true, false]
161+
name: "centos-stream-9-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins"
162+
continue-on-error: true
163+
runs-on: "ubuntu-latest"
164+
steps:
165+
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
166+
with:
167+
submodules: "recursive"
168+
169+
- name: "Work around actions/runner-images/issues/6775"
170+
run: "chown $(id -u):$(id -g) -R ."
171+
shell: "bash"
172+
173+
- uses: "./.github/actions/run-on-image"
174+
env:
175+
OS_NAME: "centos-stream-9"
176+
with:
177+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
178+
use_published_image: >-
179+
${{needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'false'
180+
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
181+
run_command: >-
182+
CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) task deps:core
183+
&& python3 /mnt/repo/components/core/tools/scripts/utils/build-and-run-unit-tests.py
184+
${{matrix.use_shared_libs == true && '--use-shared-libs' || ''}}
185+
--source-dir /mnt/repo/components/core
186+
--build-dir /mnt/repo/components/core/build
187+
--num-jobs $(getconf _NPROCESSORS_ONLN)
188+
150189
centos-stream-9-binaries:
151190
# Run if the ancestor jobs succeeded OR they were skipped and clp was changed.
152191
if: >-

components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ build_cmd=(
1010
docker buildx build
1111
--platform linux/arm64
1212
--tag clp-core-dependencies-aarch64-musllinux_1_2:dev
13-
"$component_root"
1413
--file "${script_dir}/Dockerfile"
1514
--load
15+
"$component_root"
1616
)
1717

1818
if command -v git >/dev/null && git -C "$script_dir" rev-parse --is-inside-work-tree >/dev/null ;

components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ build_cmd=(
1010
docker buildx build
1111
--platform linux/amd64
1212
--tag clp-core-dependencies-x86-musllinux_1_2:dev
13-
"$component_root"
1413
--file "${script_dir}/Dockerfile"
1514
--load
15+
"$component_root"
1616
)
1717

1818
if command -v git >/dev/null && git -C "$script_dir" rev-parse --is-inside-work-tree >/dev/null ;

components/core/tools/scripts/lib_install/musllinux_1_2/install-prebuilt-packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -eu
44
set -o pipefail
55

6-
apk update && apk add \
6+
apk update && apk add --no-cache \
77
openjdk11-jdk \
88
jq \
99
curl-dev \

docs/src/dev-guide/tooling-containers.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ To build an image locally, run the `build.sh` script in the image's directory.
88

99
## clp-core-dependencies-<arch>-manylinux_2_28
1010

11-
Images containing the dependencies necessary to build CLP core in a [manylinux_2_28][manylinux_2_28]
12-
environment (aarch64 or x86).
13-
14-
Binaries built on manylinux_2_28 (based on AlmaLinux 8) are expected to be compatible with other
15-
distros using glibc 2.28+, including:
11+
Images containing the dependencies necessary to build CLP core in a [musllinux_1_2][musllinux_1_2] environment (aarch64 or x86).
12+
Binaries built on musllinux_1_2 (based on Alpine Linux 3.22) are expected to be compatible with other
13+
distros using musl 1.2+, including:
1614

1715
* CentOS/RHEL 8+
1816
* Debian 10+

0 commit comments

Comments
 (0)