Skip to content

Commit fb47ca2

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

File tree

4 files changed

+8
-46
lines changed

4 files changed

+8
-46
lines changed

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

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -147,45 +147,6 @@ 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-
189150
centos-stream-9-binaries:
190151
# Run if the ancestor jobs succeeded OR they were skipped and clp was changed.
191152
if: >-

components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COPY ./tools/scripts/lib_install ./tools/scripts/lib_install
88
RUN ./tools/scripts/lib_install/musllinux_1_2/install-all.sh
99

1010
# Remove cached files
11-
RUN apk cache clean && rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
11+
RUN apk cache clean --all && rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
1212

1313
# NOTE: Don't flatten the image or else we'll lose any environment modifications from the base
1414
# image.

components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COPY ./tools/scripts/lib_install ./tools/scripts/lib_install
88
RUN ./tools/scripts/lib_install/musllinux_1_2/install-all.sh
99

1010
# Remove cached files
11-
RUN apk cache clean && rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
11+
RUN apk cache clean --all && rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
1212

1313
# NOTE: Don't flatten the image or else we'll lose any environment modifications from the base
1414
# image.

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ 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 [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:
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:
1416

1517
* CentOS/RHEL 8+
1618
* Debian 10+
@@ -59,7 +61,6 @@ distros using musl 1.2, including:
5961
components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64
6062
```
6163

62-
6364
## clp-core-dependencies-x86-centos-stream-9
6465

6566
An image containing the dependencies necessary to build CLP core in a CentOS Stream 9 x86
@@ -138,4 +139,4 @@ environment.
138139
[exe-ubuntu-jammy]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-execution-x86-ubuntu-jammy
139140
[gh-packages]: https://github.com/orgs/y-scope/packages?repo_name=clp
140141
[manylinux_2_28]: https://github.com/pypa/manylinux?tab=readme-ov-file#manylinux_2_28-almalinux-8-based
141-
[musllinux_1_2]: https://github.com/pypa/manylinux?tab=readme-ov-file#musllinux_1_2-alpine-linux-322-based-313-compatible
142+
[musllinux_1_2]: https://github.com/pypa/manylinux?tab=readme-ov-file#musllinux_1_2-alpine-linux-322-based-313-compatible

0 commit comments

Comments
 (0)