Skip to content

Commit 7a4f6b0

Browse files
authored
Merge branch 'y-scope:main' into slackButton
2 parents 9b3732d + f2da1db commit 7a4f6b0

142 files changed

Lines changed: 7806 additions & 5309 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: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,10 @@ jobs:
463463
run: "chown $(id -u):$(id -g) -R ."
464464
shell: "bash"
465465

466-
# NOTE: We don't use the cache for scheduled runs so that they run lint:check-cpp-static-full
467-
# on all files.
466+
# NOTE: We don't restore the cache for `schedule` runs so that below,
467+
# `lint:check-cpp-static-full` runs on all files. If we don't do this periodically,
468+
# `lint:check-cpp-static-full` could miss issues in files that haven't changed but depend on
469+
# files which have changed.
468470
- if: "'schedule' != github.event_name"
469471
name: "Restore lint:check-cpp-static-full cache"
470472
id: "cache-restore-lint-check-cpp-static-full"
@@ -475,9 +477,10 @@ jobs:
475477
.task/checksum/utils-cpp-lint-clang-tidy-*
476478
build/lint-clang-tidy
477479
478-
# NOTE: We use a per-OS cache since different OSes may trigger different clang-tidy
479-
# violations.
480-
key: "main-branch-ubuntu-jammy-lint:check-cpp-static-full"
480+
# NOTE: This key must be kept in-sync with the key prefix in the `actions/cache/save` step
481+
# below (we can't use the output of the current step since `schedule` workflow runs don't
482+
# run this step).
483+
key: "lint:check-cpp-static-full-on-ubuntu-24.04"
481484

482485
- uses: "./.github/actions/run-on-image"
483486
env:
@@ -505,7 +508,15 @@ jobs:
505508
.task/checksum/lint-check-cpp-static-full
506509
.task/checksum/utils-cpp-lint-clang-tidy-*
507510
build/lint-clang-tidy
508-
key: "${{steps.cache-restore-lint-check-cpp-static-full.outputs.cache-primary-key}}"
511+
512+
# NOTE: This key prefix (without the hash) must be kept in-sync with the
513+
# `actions/cache/restore` step above.
514+
key: >-
515+
lint:check-cpp-static-full-on-ubuntu-24.04-${{hashFiles(
516+
'.task/checksum/lint-check-cpp-static-full',
517+
'.task/checksum/utils-cpp-lint-clang-tidy-*',
518+
'build/lint-clang-tidy/**/*'
519+
)}}
509520
510521
package-image:
511522
name: "package-image"

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ jobs:
9494
--num-jobs $(getconf _NPROCESSORS_ONLN)
9595
--test-spec "~[Stopwatch]"
9696
97-
# NOTE: We don't use the cache for scheduled runs so that they run lint:check-cpp-static-full
98-
# on all files.
97+
# NOTE: We don't restore the cache for `schedule` runs so that below,
98+
# `lint:check-cpp-static-full` runs on all files. If we don't do this periodically,
99+
# `lint:check-cpp-static-full` could miss issues in files that haven't changed but depend on
100+
# files which have changed.
99101
- if: "'schedule' != github.event_name"
100102
name: "Restore lint:check-cpp-static-full cache"
101103
id: "cache-restore-lint-check-cpp-static-full"
@@ -106,9 +108,11 @@ jobs:
106108
.task/checksum/utils-cpp-lint-clang-tidy-*
107109
build/lint-clang-tidy
108110
109-
# NOTE: We use a per-OS cache since different OSes may trigger different clang-tidy
110-
# violations.
111-
key: "main-branch-${{matrix.os}}-lint:check-cpp-static-full"
111+
# NOTE: This key must be kept in-sync with the key prefix in the `actions/cache/save` step
112+
# below (we can't use the output of the current step since `schedule` workflow runs don't
113+
# run this step).
114+
key: "lint:check-cpp-static-full-on-${{matrix.os}}-with\
115+
-${{matrix.use_shared_libs == true && 'shared' || 'static'}}-libs"
112116

113117
# TODO: When enough files are passing clang-tidy, switch to a full pass on schedule only.
114118
# - run: >-
@@ -129,4 +133,14 @@ jobs:
129133
.task/checksum/lint-check-cpp-static-full
130134
.task/checksum/utils-cpp-lint-clang-tidy-*
131135
build/lint-clang-tidy
132-
key: "${{steps.cache-restore-lint-check-cpp-static-full.outputs.cache-primary-key}}"
136+
137+
# NOTE: This key prefix (without the hash) must be kept in-sync with the
138+
# `actions/cache/restore` step above.
139+
key: >-
140+
lint:check-cpp-static-full-on-${{matrix.os}}-with-${{
141+
matrix.use_shared_libs == true && 'shared' || 'static'
142+
}}-libs-${{hashFiles(
143+
'.task/checksum/lint-check-cpp-static-full',
144+
'.task/checksum/utils-cpp-lint-clang-tidy-*',
145+
'build/lint-clang-tidy/**/*'
146+
)}}

.github/workflows/clp-rust-checks.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,17 @@ name: "clp-rust-checks"
22

33
on:
44
pull_request:
5+
paths: &monitored_paths
6+
- ".cargo/**"
7+
- "Cargo.lock"
8+
- "Cargo.toml"
9+
- ".github/workflows/clp-rust-checks.yaml"
10+
- "components/clp-rust-utils/**"
11+
- "components/log-ingestor/**"
12+
- "taskfile.yaml"
13+
- "taskfiles/**"
514
push:
15+
paths: *monitored_paths
616
schedule:
717
# Run daily at 00:15 UTC (the 15 is to avoid periods of high load)
818
- cron: "15 0 * * *"
@@ -31,6 +41,10 @@ jobs:
3141
shell: "bash"
3242
run: "npm install -g @go-task/cli@3.44.0"
3343

44+
- name: "Validate lock files"
45+
shell: "bash"
46+
run: "task deps:lock:check-rust"
47+
3448
- name: "Lint"
3549
shell: "bash"
3650
run: "task lint:check-rust"
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: "clp-uv-checks"
2+
3+
on:
4+
pull_request:
5+
paths: &monitored_paths
6+
- ".github/workflows/clp-uv-checks.yaml"
7+
- "components/clp-mcp-server/pyproject.toml"
8+
- "components/clp-mcp-server/uv.lock"
9+
- "components/clp-package-utils/pyproject.toml"
10+
- "components/clp-package-utils/uv.lock"
11+
- "components/clp-py-utils/pyproject.toml"
12+
- "components/clp-py-utils/uv.lock"
13+
- "components/job-orchestration/pyproject.toml"
14+
- "components/job-orchestration/uv.lock"
15+
- "integration-tests/pyproject.toml"
16+
- "integration-tests/uv.lock"
17+
push:
18+
paths: *monitored_paths
19+
schedule:
20+
# Run daily at 00:15 UTC (the 15 is to avoid periods of high load)
21+
- cron: "15 0 * * *"
22+
workflow_dispatch:
23+
24+
concurrency:
25+
group: "${{github.workflow}}-${{github.ref}}"
26+
# Cancel in-progress jobs for efficiency
27+
cancel-in-progress: true
28+
29+
jobs:
30+
uv-checks:
31+
strategy:
32+
matrix:
33+
os:
34+
- "macos-15"
35+
- "ubuntu-22.04"
36+
- "ubuntu-24.04"
37+
runs-on: "${{matrix.os}}"
38+
steps:
39+
- uses: "actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8" # v5.0.0
40+
with:
41+
submodules: "recursive"
42+
43+
- name: "Install task"
44+
shell: "bash"
45+
run: "npm install -g @go-task/cli@3.44.0"
46+
47+
- name: "Install the latest version of uv"
48+
uses: "astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41" # v7.1.2
49+
50+
- name: "Validate lock files"
51+
shell: "bash"
52+
run: "task deps:lock:check-uv"

0 commit comments

Comments
 (0)