Skip to content

Commit 04c188f

Browse files
committed
Revert includes changes and dev-utils bump.
1 parent 27044bc commit 04c188f

File tree

5 files changed

+11
-21
lines changed

5 files changed

+11
-21
lines changed

taskfiles/deps.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
version: "3"
22

3-
includes:
4-
utils:
5-
internal: true
6-
taskfile: "../tools/yscope-dev-utils/exports/taskfiles/utils/utils.yaml"
7-
83
vars:
94
# General variables
105
G_DEPS_DIR: "{{.G_BUILD_DIR}}/deps"
@@ -17,7 +12,7 @@ tasks:
1712
desc: "Install all dependencies required by ystdlib."
1813
run: "once"
1914
cmds:
20-
- task: "utils:cmake:install-deps-and-generate-settings"
15+
- task: ":utils:cmake:install-deps-and-generate-settings"
2116
vars:
2217
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
2318
DEP_TASK: "install-all-parallel"
@@ -33,7 +28,7 @@ tasks:
3328
internal: true
3429
run: "once"
3530
cmds:
36-
- task: "utils:boost:download-and-install"
31+
- task: ":utils:boost:download-and-install"
3732
vars:
3833
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
3934
FILE_SHA256: "d6c69e4459eb5d6ec208250291221e7ff4a2affde9af6e49c9303b89c687461f"
@@ -46,7 +41,7 @@ tasks:
4641
internal: true
4742
run: "once"
4843
cmds:
49-
- task: "utils:cmake:install-remote-tar"
44+
- task: ":utils:cmake:install-remote-tar"
5045
vars:
5146
CMAKE_PACKAGE_NAME: "Catch2"
5247
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"

taskfiles/lint-cmake.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
version: "3"
22

3-
includes:
4-
deps:
5-
internal: true
6-
taskfile: "deps.yaml"
7-
83
tasks:
94
check-cmake:
105
desc: "Runs the CMake linters."
@@ -47,7 +42,7 @@ tasks:
4742
- "FLAGS"
4843
dir: "{{.ROOT_DIR}}"
4944
deps:
50-
- "deps:install-all" # Allow Gersemi to parse 3rdparty CMake modules for linting
45+
- ":deps:install-all" # Allow Gersemi to parse 3rdparty CMake modules for linting
5146
- "venv"
5247
cmds:
5348
- |-

taskfiles/lint-cpp.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ tasks:
3030
- "cpp-configs"
3131
- "venv"
3232
cmds:
33-
- task: "utils:cpp-lint:clang-format"
33+
- task: ":utils:cpp-lint:clang-format"
3434
vars:
3535
FLAGS: ["--dry-run"]
3636
INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
@@ -44,7 +44,7 @@ tasks:
4444
- "cpp-configs"
4545
- "venv"
4646
cmds:
47-
- task: "utils:cpp-lint:clang-format"
47+
- task: ":utils:cpp-lint:clang-format"
4848
vars:
4949
FLAGS: ["-i"]
5050
INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
@@ -63,7 +63,7 @@ tasks:
6363
- "cpp-configs"
6464
- "venv"
6565
cmds:
66-
- task: "utils:cpp-lint:clang-tidy-find"
66+
- task: ":utils:cpp-lint:clang-tidy-find"
6767
vars:
6868
FLAGS:
6969
- "--config-file '{{.ROOT_DIR}}/.clang-tidy'"

taskfiles/lint-venv.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ tasks:
1515
run: "once"
1616
deps:
1717
- ":init"
18-
- task: "utils:checksum:validate"
18+
- task: ":utils:checksum:validate"
1919
vars:
2020
CHECKSUM_FILE: "{{.CHECKSUM_FILE}}"
2121
INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"]
2222
cmds:
23-
- task: "utils:misc:create-venv"
23+
- task: ":utils:misc:create-venv"
2424
vars:
2525
LABEL: "lint"
2626
OUTPUT_DIR: "{{.OUTPUT_DIR}}"
2727
REQUIREMENTS_FILE: "{{.ROOT_DIR}}/lint-requirements.txt"
2828
# This command must be last
29-
- task: "utils:checksum:compute"
29+
- task: ":utils:checksum:compute"
3030
vars:
3131
CHECKSUM_FILE: "{{.CHECKSUM_FILE}}"
3232
INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"]

0 commit comments

Comments
 (0)