Skip to content

Commit 4dc834b

Browse files
junhaoliaojunhaoliao
authored
Merge branch 'main' into aws-hostpath
2 parents 48424d4 + 645fe06 commit 4dc834b

217 files changed

Lines changed: 5756 additions & 2193 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/clp-artifact-build.yaml‎

Lines changed: 88 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ on:
1515
workflow_dispatch:
1616

1717
env:
18+
DEPS_IMAGE_NAME_PREFIX_AARCH64: "clp-core-dependencies-aarch64-"
1819
BINARIES_ARTIFACT_NAME_PREFIX: "clp-core-binaries-"
19-
DEPS_IMAGE_NAME_PREFIX: "clp-core-dependencies-x86-"
2020
PYTHON_WHEELS_ARTIFACT_NAME_PREFIX: "clp-python-wheels-"
21+
DEPS_IMAGE_NAME_PREFIX_X86: "clp-core-dependencies-x86-"
2122

2223
concurrency:
2324
group: "${{github.workflow}}-${{github.ref}}"
@@ -37,13 +38,15 @@ jobs:
3738
}}
3839
outputs:
3940
centos_stream_9_image_changed: "${{steps.filter.outputs.centos_stream_9_image}}"
41+
manylinux_2_28_aarch64_image_changed: "${{steps.filter.outputs.manylinux_2_28_aarch64_image}}"
4042
manylinux_2_28_x86_64_image_changed: "${{steps.filter.outputs.manylinux_2_28_x86_64_image}}"
43+
musllinux_1_2_aarch64_image_changed: "${{steps.filter.outputs.musllinux_1_2_aarch64_image}}"
4144
musllinux_1_2_x86_64_image_changed: "${{steps.filter.outputs.musllinux_1_2_x86_64_image}}"
4245
ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}"
4346
clp_changed: "${{steps.filter.outputs.clp}}"
4447
yscope_clp_core_changed: "${{steps.filter.outputs.yscope-clp-core}}"
4548
steps:
46-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
49+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
4750
with:
4851
submodules: "recursive"
4952

@@ -77,10 +80,18 @@ jobs:
7780
- *_deps_images_common_paths
7881
- "components/core/tools/docker-images/clp-env-base-centos-stream-9/**"
7982
- "components/core/tools/scripts/lib_install/centos-stream-9/**"
83+
manylinux_2_28_aarch64_image:
84+
- *_deps_images_common_paths
85+
- "components/core/tools/docker-images/clp-env-base-manylinux_2_28-aarch64/**"
86+
- "components/core/tools/scripts/lib_install/manylinux_2_28/**"
8087
manylinux_2_28_x86_64_image:
8188
- *_deps_images_common_paths
8289
- "components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/**"
8390
- "components/core/tools/scripts/lib_install/manylinux_2_28/**"
91+
musllinux_1_2_aarch64_image:
92+
- *_deps_images_common_paths
93+
- "components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/**"
94+
- "components/core/tools/scripts/lib_install/musllinux_1_2/**"
8495
musllinux_1_2_x86_64_image:
8596
- *_deps_images_common_paths
8697
- "components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/**"
@@ -115,7 +126,7 @@ jobs:
115126
needs: "filter-relevant-changes"
116127
runs-on: *runner
117128
steps:
118-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
129+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
119130
with:
120131
submodules: "recursive"
121132

@@ -127,21 +138,47 @@ jobs:
127138
env:
128139
OS_NAME: "centos-stream-9"
129140
with:
130-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
141+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
131142
docker_context: "components/core"
132143
docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\
133144
/Dockerfile"
134145
push_deps_image: >-
135146
${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}}
136147
token: "${{secrets.GITHUB_TOKEN}}"
137148

149+
manylinux_2_28-aarch64-deps-image:
150+
name: "manylinux_2_28-aarch64-deps-image"
151+
if: "needs.filter-relevant-changes.outputs.manylinux_2_28_aarch64_image_changed == 'true'"
152+
needs: "filter-relevant-changes"
153+
runs-on: "ubuntu-24.04-arm"
154+
steps:
155+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
156+
with:
157+
submodules: "recursive"
158+
159+
- name: "Work around actions/runner-images/issues/6775"
160+
run: "chown $(id -u):$(id -g) -R ."
161+
shell: "bash"
162+
163+
- uses: "./.github/actions/clp-core-build-containers"
164+
env:
165+
OS_NAME: "manylinux_2_28"
166+
with:
167+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_AARCH64}}${{env.OS_NAME}}"
168+
docker_context: "components/core"
169+
docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-aarch64\
170+
/Dockerfile"
171+
push_deps_image: >-
172+
${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}}
173+
token: "${{secrets.GITHUB_TOKEN}}"
174+
138175
manylinux_2_28-x86_64-deps-image:
139176
name: "manylinux_2_28-x86_64-deps-image"
140177
if: "needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'true'"
141178
needs: "filter-relevant-changes"
142179
runs-on: *runner
143180
steps:
144-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
181+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
145182
with:
146183
submodules: "recursive"
147184

@@ -153,21 +190,47 @@ jobs:
153190
env:
154191
OS_NAME: "manylinux_2_28"
155192
with:
156-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
193+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
157194
docker_context: "components/core"
158195
docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-x86_64\
159196
/Dockerfile"
160197
push_deps_image: >-
161198
${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}}
162199
token: "${{secrets.GITHUB_TOKEN}}"
163200

201+
musllinux_1_2-aarch64-deps-image:
202+
name: "musllinux_1_2-aarch64-deps-image"
203+
if: "needs.filter-relevant-changes.outputs.musllinux_1_2_aarch64_image_changed == 'true'"
204+
needs: "filter-relevant-changes"
205+
runs-on: "ubuntu-24.04-arm"
206+
steps:
207+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
208+
with:
209+
submodules: "recursive"
210+
211+
- name: "Work around actions/runner-images/issues/6775"
212+
run: "chown $(id -u):$(id -g) -R ."
213+
shell: "bash"
214+
215+
- uses: "./.github/actions/clp-core-build-containers"
216+
env:
217+
OS_NAME: "musllinux_1_2"
218+
with:
219+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_AARCH64}}${{env.OS_NAME}}"
220+
docker_context: "components/core"
221+
docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-aarch64\
222+
/Dockerfile"
223+
push_deps_image: >-
224+
${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main'}}
225+
token: "${{secrets.GITHUB_TOKEN}}"
226+
164227
musllinux_1_2-x86_64-deps-image:
165228
name: "musllinux_1_2-x86_64-deps-image"
166229
if: "needs.filter-relevant-changes.outputs.musllinux_1_2_x86_64_image_changed == 'true'"
167230
needs: "filter-relevant-changes"
168231
runs-on: *runner
169232
steps:
170-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
233+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
171234
with:
172235
submodules: "recursive"
173236

@@ -179,7 +242,7 @@ jobs:
179242
env:
180243
OS_NAME: "musllinux_1_2"
181244
with:
182-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
245+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
183246
docker_context: "components/core"
184247
docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}-x86_64\
185248
/Dockerfile"
@@ -193,7 +256,7 @@ jobs:
193256
needs: "filter-relevant-changes"
194257
runs-on: *runner
195258
steps:
196-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
259+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
197260
with:
198261
submodules: "recursive"
199262

@@ -205,7 +268,7 @@ jobs:
205268
env:
206269
OS_NAME: "ubuntu-jammy"
207270
with:
208-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
271+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
209272
docker_context: "components/core"
210273
docker_file: "components/core/tools/docker-images/clp-env-base-${{env.OS_NAME}}\
211274
/Dockerfile"
@@ -228,7 +291,7 @@ jobs:
228291
continue-on-error: true
229292
runs-on: *runner
230293
steps:
231-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
294+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
232295
with:
233296
submodules: "recursive"
234297

@@ -240,7 +303,7 @@ jobs:
240303
env:
241304
OS_NAME: "centos-stream-9"
242305
with:
243-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
306+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
244307
use_published_image: >-
245308
${{needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'false'
246309
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
@@ -268,7 +331,7 @@ jobs:
268331
continue-on-error: true
269332
runs-on: *runner
270333
steps:
271-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
334+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
272335
with:
273336
submodules: "recursive"
274337

@@ -280,7 +343,7 @@ jobs:
280343
env:
281344
OS_NAME: "manylinux_2_28"
282345
with:
283-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
346+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
284347
use_published_image: >-
285348
${{needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'false'
286349
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
@@ -308,7 +371,7 @@ jobs:
308371
continue-on-error: true
309372
runs-on: *runner
310373
steps:
311-
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v6.0.1
374+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
312375
with:
313376
submodules: "recursive"
314377

@@ -318,7 +381,7 @@ jobs:
318381

319382
- uses: "./.github/actions/run-on-image"
320383
with:
321-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
384+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
322385
use_published_image: >-
323386
${{needs.filter-relevant-changes.outputs.manylinux_2_28_x86_64_image_changed == 'false'
324387
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
@@ -361,7 +424,7 @@ jobs:
361424
continue-on-error: true
362425
runs-on: *runner
363426
steps:
364-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
427+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
365428
with:
366429
submodules: "recursive"
367430

@@ -373,7 +436,7 @@ jobs:
373436
env:
374437
OS_NAME: "musllinux_1_2"
375438
with:
376-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
439+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
377440
use_published_image: >-
378441
${{needs.filter-relevant-changes.outputs.musllinux_1_2_x86_64_image_changed == 'false'
379442
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
@@ -406,7 +469,7 @@ jobs:
406469
continue-on-error: true
407470
runs-on: *runner
408471
steps:
409-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
472+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
410473
with:
411474
submodules: "recursive"
412475

@@ -416,7 +479,7 @@ jobs:
416479

417480
- uses: "./.github/actions/run-on-image"
418481
with:
419-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
482+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
420483
use_published_image: >-
421484
${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false'
422485
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
@@ -456,7 +519,7 @@ jobs:
456519
OS_NAME: "ubuntu-jammy"
457520
TMP_OUTPUT_DIR: "/tmp"
458521
steps:
459-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
522+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
460523
with:
461524
submodules: "recursive"
462525

@@ -520,7 +583,7 @@ jobs:
520583
- "ubuntu-jammy-deps-image"
521584
runs-on: *runner
522585
steps:
523-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
586+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
524587
with:
525588
# Fetch history so that the `clang-tidy-diff` task can compare against the main branch.
526589
fetch-depth: 0
@@ -553,7 +616,7 @@ jobs:
553616
env:
554617
OS_NAME: "ubuntu-jammy"
555618
with:
556-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
619+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
557620
use_published_image: >-
558621
${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false'
559622
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
@@ -597,7 +660,7 @@ jobs:
597660
- "ubuntu-jammy-deps-image"
598661
runs-on: *runner
599662
steps:
600-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
663+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
601664
with:
602665
submodules: "recursive"
603666

@@ -610,7 +673,7 @@ jobs:
610673
env:
611674
OS_NAME: "ubuntu-jammy"
612675
with:
613-
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX}}${{env.OS_NAME}}"
676+
image_name: "${{env.DEPS_IMAGE_NAME_PREFIX_X86}}${{env.OS_NAME}}"
614677
use_published_image: >-
615678
${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false'
616679
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- "taskfile.yaml"
1717
- "taskfiles/**"
1818
- "tools/scripts/deps-download/**"
19+
- "tools/yscope-dev-utils"
1920
push:
2021
paths: *monitored_paths
2122
schedule:
@@ -40,7 +41,7 @@ jobs:
4041
- false
4142
runs-on: "${{matrix.os}}"
4243
steps:
43-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
44+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
4445
with:
4546
# Fetch history so that the `clang-tidy-diff` task can compare against the main branch.
4647
fetch-depth: 0

‎.github/workflows/clp-docs-generated-code-checks.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
# Runs only on Ubuntu Jammy (22.04) since the Rust components are only built on this platform.
1616
runs-on: "ubuntu-22.04"
1717
steps:
18-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
18+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
1919
with:
2020
submodules: "recursive"
2121

22-
- name: "Install task"
23-
shell: "bash"
24-
run: "npm install -g @go-task/cli@3.48.0"
22+
- uses: "./tools/yscope-dev-utils/exports/github/actions/install-go-task"
23+
with:
24+
version: "3.48.0"
2525

2626
- name: "Generate OpenAPI docs"
2727
shell: "bash"

‎.github/workflows/clp-docs.yaml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,16 @@ jobs:
2323
- "ubuntu-24.04"
2424
runs-on: "${{matrix.os}}"
2525
steps:
26-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
26+
- uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
2727
with:
2828
lfs: "true"
2929
submodules: "recursive"
3030

31-
- uses: "actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38"
32-
with:
33-
python-version: "3.10"
34-
35-
- name: "Install task"
36-
shell: "bash"
37-
run: "npm install -g @go-task/cli@3.48.0"
31+
- uses: "./tools/yscope-dev-utils/exports/github/actions/install-python"
3832

39-
- if: "matrix.os == 'macos-15'"
40-
name: "Install coreutils (for md5sum)"
41-
run: "brew install coreutils"
33+
- uses: "./tools/yscope-dev-utils/exports/github/actions/install-go-task"
34+
with:
35+
version: "3.48.0"
4236

4337
- name: "Build docs"
4438
shell: "bash"

0 commit comments

Comments
 (0)