Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bdc17df
Bump version
Bill-hbrhbr Jul 25, 2025
5381afb
Merge branch 'main' into bump-yscope-dev-utils
Bill-hbrhbr Jul 25, 2025
e7412eb
Install uv for the lint process
Bill-hbrhbr Jul 25, 2025
918a3a5
Add uv requirement to CLP linters doc page
Bill-hbrhbr Jul 25, 2025
2baca84
Install uv in all docker images for os deps
Bill-hbrhbr Jul 25, 2025
b1fe7e5
Move uv install to Dockerfile
Bill-hbrhbr Jul 25, 2025
71e670f
Temporarily change task deps core to sequential
Bill-hbrhbr Jul 25, 2025
5b1f9ed
Fix ubuntu-jammy and centos uv workflow issues
Bill-hbrhbr Jul 26, 2025
a4c3506
Fix cache dir
Bill-hbrhbr Jul 26, 2025
bb8348e
Add cache dir variable directly to uv task
Bill-hbrhbr Jul 26, 2025
c05b152
Fix uv dirs
Bill-hbrhbr Jul 26, 2025
cb94a12
Fix to use relative paths
Bill-hbrhbr Jul 26, 2025
fa0db54
Change task deps back to parallel
Bill-hbrhbr Jul 26, 2025
dc4b1ea
Update docs
Bill-hbrhbr Jul 27, 2025
63ed21a
Use comment to separate bewteen exclude patterns
Bill-hbrhbr Jul 27, 2025
b2b7a93
Fix doc link
Bill-hbrhbr Jul 27, 2025
3220afd
rename anchor
Bill-hbrhbr Jul 27, 2025
afc267e
Merge branch 'main' into bump-yscope-dev-utils
Bill-hbrhbr Jul 27, 2025
0606b6a
Merge branch 'main' into bump-yscope-dev-utils
Bill-hbrhbr Jul 31, 2025
f31a2d9
Address review comments
Bill-hbrhbr Jul 31, 2025
11654f2
Test running GH CI docker deps image as root
Bill-hbrhbr Jul 31, 2025
165e068
Revert "Test running GH CI docker deps image as root"
Bill-hbrhbr Jul 31, 2025
d0d4830
test removing user only
Bill-hbrhbr Jul 31, 2025
d767d73
Revert "test removing user only"
Bill-hbrhbr Jul 31, 2025
49ee60c
Add issues todo in code
Bill-hbrhbr Jul 31, 2025
f5c217a
Update .github/workflows/clp-core-build.yaml
Bill-hbrhbr Jul 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/clp-core-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -355,11 +355,11 @@ jobs:
use_published_image: >-
${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false'
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
# TODO: When enough files are passing clang-tidy, switch to a full pass on schedule only.
# run_command: >-
# task lint:check-cpp-${{(github.event_name == 'schedule') && 'full' || 'diff'}}
# TODO: We set HOME due to permission issues inside the container used in run-on-image.
# See: https://github.com/y-scope/clp/issues/1145
run_command: >-
CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN)
HOME=/tmp
task lint:check-cpp-full
Comment on lines +358 to 363
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Variable assignments are now passed correctly; minor readability nit

With the folded scalar (>-) these three lines flatten to
CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) HOME=/tmp task lint:check-cpp-full, so both env vars reach task, fixing the earlier export issue.

To make this behaviour obvious to future readers you could keep everything on one physical line (or use the back-slash style used elsewhere):

-            CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN)
-            HOME=/tmp
-            task lint:check-cpp-full
+            CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN) \
+            HOME=/tmp \
+            task lint:check-cpp-full

Pure style preference – no functional change.

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents
In .github/workflows/clp-core-build.yaml around lines 358 to 363, the multi-line
variable assignments and command are currently folded into a single line due to
the use of the folded scalar (>-), which can be unclear to readers. To improve
readability and make it obvious that both environment variables are passed to
the `task` command, rewrite the command as a single physical line or use
backslashes to explicitly continue the command across lines, matching the style
used elsewhere in the file.


# Cache the source file checksums and the generated files (logs) for the
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/clp-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
shell: "bash"
run: "npm install -g @go-task/cli"

- name: "Install uv"
shell: "bash"
run: "curl --fail --location --silent --show-error https://astral.sh/uv/install.sh | sh"

- if: "matrix.os == 'macos-15'"
name: "Install coreutils (for md5sum)"
run: "brew install coreutils"
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.clang-format
.clang-tidy
.lint-venv/
.task/
build/
**/dist/
dist/
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ ADD ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN ./tools/scripts/lib_install/centos-stream-9/install-all.sh

RUN pip3 install --no-cache-dir uv

# Remove cached files
RUN dnf clean all \
&& rm -rf /tmp/* /var/tmp/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ ADD ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN ./tools/scripts/lib_install/ubuntu-jammy/install-all.sh

RUN pip3 install --no-cache-dir uv

# Remove cached files
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ curl \
/Formula/g/go-task.rb
brew install --formula "$task_formula_path"

if ! command -v uv ; then
brew install uv
fi

rm -rf "$formula_dir"

brew install \
Expand Down
8 changes: 6 additions & 2 deletions docs/src/dev-guide/contributing-linting.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ To run the linting tools, besides commonly installed tools like `tar`, you'll ne
* `md5sum`
* Python 3.9 or newer
* python3-venv (for the version of Python installed)
* [Task] >= 3.38.0 and < 3.43.0
* We constrain the version due to unresolved [issues][clp-issue-872].
* [Task] >= 3.40.0 and < 3.43.0
* Minimum version 3.40.0 is required for [yscope-dev-utils].
* We constrain the version to < 3.43.0 due to unresolved [issues][clp-issue-872].
* [uv] >= 0.7.10

## Running the linters

Expand All @@ -37,3 +39,5 @@ task lint:fix
[clp-issue-872]: https://github.com/y-scope/clp/issues/872
[feature-req]: https://github.com/y-scope/clp/issues/new?assignees=&labels=enhancement&projects=&template=feature-request.yml
[Task]: https://taskfile.dev/
[uv]: https://docs.astral.sh/uv/
[yscope-dev-utils]: https://github.com/y-scope/yscope-dev-utils
1,133 changes: 568 additions & 565 deletions taskfiles/lint.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/scripts/deps-download/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
project_root_dir="$script_dir/../../../"
download_dep_script="$script_dir/download-dep.py"

readonly YSCOPE_DEV_UTILS_COMMIT_SHA="76aecbd6d0db6e2078005431946b5c2e716c4291"
readonly YSCOPE_DEV_UTILS_COMMIT_SHA="b965f19f3e11c548f32bf7ab8e28ff38906be018"
python3 "${download_dep_script}" \
"https://github.com/y-scope/yscope-dev-utils/archive/${YSCOPE_DEV_UTILS_COMMIT_SHA}.zip" \
"yscope-dev-utils-${YSCOPE_DEV_UTILS_COMMIT_SHA}" \
Expand Down
Loading