Skip to content

Commit 581bd46

Browse files
build(deps): Bump yscope-dev-utils to the newest version: (#1126)
Co-authored-by: davidlion <[email protected]>
1 parent 00a1e4d commit 581bd46

File tree

10 files changed

+594
-573
lines changed

10 files changed

+594
-573
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,11 @@ jobs:
355355
use_published_image: >-
356356
${{needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'false'
357357
|| (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')}}
358-
# TODO: When enough files are passing clang-tidy, switch to a full pass on schedule only.
359-
# run_command: >-
360-
# task lint:check-cpp-${{(github.event_name == 'schedule') && 'full' || 'diff'}}
358+
# TODO: We set HOME due to permission issues inside the container used in run-on-image.
359+
# See: https://github.com/y-scope/clp/issues/1145
361360
run_command: >-
362361
CLP_CORE_MAX_PARALLELISM_PER_BUILD_TASK=$(getconf _NPROCESSORS_ONLN)
362+
HOME=/tmp
363363
task lint:check-cpp-full
364364
365365
# Cache the source file checksums and the generated files (logs) for the

.github/workflows/clp-lint.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
shell: "bash"
3636
run: "npm install -g @go-task/cli"
3737

38+
- name: "Install uv"
39+
shell: "bash"
40+
run: "curl --fail --location --silent --show-error https://astral.sh/uv/install.sh | sh"
41+
3842
- if: "matrix.os == 'macos-15'"
3943
name: "Install coreutils (for md5sum)"
4044
run: "brew install coreutils"

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
.clang-format
2+
.clang-tidy
13
.lint-venv/
24
.task/
35
build/
4-
**/dist/
6+
dist/

components/core/tools/docker-images/clp-env-base-centos-stream-9/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ADD ./tools/scripts/lib_install ./tools/scripts/lib_install
77

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

10+
RUN pip3 install --no-cache-dir uv
11+
1012
# Remove cached files
1113
RUN dnf clean all \
1214
&& rm -rf /tmp/* /var/tmp/*

components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ADD ./tools/scripts/lib_install ./tools/scripts/lib_install
77

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

10+
RUN pip3 install --no-cache-dir uv
11+
1012
# Remove cached files
1113
RUN apt-get clean \
1214
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

components/core/tools/scripts/lib_install/macos/install-all.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ curl \
3333
/Formula/g/go-task.rb
3434
brew install --formula "$task_formula_path"
3535

36+
if ! command -v uv ; then
37+
brew install uv
38+
fi
39+
3640
rm -rf "$formula_dir"
3741

3842
brew install \

docs/src/dev-guide/contributing-linting.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ To run the linting tools, besides commonly installed tools like `tar`, you'll ne
1515
* `md5sum`
1616
* Python 3.9 or newer
1717
* python3-venv (for the version of Python installed)
18-
* [Task] >= 3.38.0 and < 3.43.0
19-
* We constrain the version due to unresolved [issues][clp-issue-872].
18+
* [Task] >= 3.40.0 and < 3.43.0
19+
* Minimum version 3.40.0 is required for [yscope-dev-utils].
20+
* We constrain the version to < 3.43.0 due to unresolved [issues][clp-issue-872].
21+
* [uv] >= 0.7.10
2022

2123
## Running the linters
2224

@@ -37,3 +39,5 @@ task lint:fix
3739
[clp-issue-872]: https://github.com/y-scope/clp/issues/872
3840
[feature-req]: https://github.com/y-scope/clp/issues/new?assignees=&labels=enhancement&projects=&template=feature-request.yml
3941
[Task]: https://taskfile.dev/
42+
[uv]: https://docs.astral.sh/uv/
43+
[yscope-dev-utils]: https://github.com/y-scope/yscope-dev-utils

taskfiles/lint.yaml

Lines changed: 568 additions & 565 deletions
Large diffs are not rendered by default.

tools/scripts/deps-download/init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
1010
project_root_dir="$script_dir/../../../"
1111
download_dep_script="$script_dir/download-dep.py"
1212

13-
readonly YSCOPE_DEV_UTILS_COMMIT_SHA="76aecbd6d0db6e2078005431946b5c2e716c4291"
13+
readonly YSCOPE_DEV_UTILS_COMMIT_SHA="b965f19f3e11c548f32bf7ab8e28ff38906be018"
1414
python3 "${download_dep_script}" \
1515
"https://github.com/y-scope/yscope-dev-utils/archive/${YSCOPE_DEV_UTILS_COMMIT_SHA}.zip" \
1616
"yscope-dev-utils-${YSCOPE_DEV_UTILS_COMMIT_SHA}" \

0 commit comments

Comments
 (0)