Skip to content

Commit 4814964

Browse files
committed
Add include refactoring back in.
1 parent 04c188f commit 4814964

File tree

6 files changed

+32
-11
lines changed

6 files changed

+32
-11
lines changed

taskfiles/deps.yaml

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

3+
includes:
4+
utils:
5+
internal: true
6+
taskfile: "../tools/yscope-dev-utils/exports/taskfiles/utils/utils.yaml"
7+
38
vars:
49
# General variables
510
G_DEPS_DIR: "{{.G_BUILD_DIR}}/deps"
@@ -12,7 +17,7 @@ tasks:
1217
desc: "Install all dependencies required by ystdlib."
1318
run: "once"
1419
cmds:
15-
- task: ":utils:cmake:install-deps-and-generate-settings"
20+
- task: "utils:cmake:install-deps-and-generate-settings"
1621
vars:
1722
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
1823
DEP_TASK: "install-all-parallel"
@@ -28,7 +33,7 @@ tasks:
2833
internal: true
2934
run: "once"
3035
cmds:
31-
- task: ":utils:boost:download-and-install"
36+
- task: "utils:boost:download-and-install"
3237
vars:
3338
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
3439
FILE_SHA256: "d6c69e4459eb5d6ec208250291221e7ff4a2affde9af6e49c9303b89c687461f"
@@ -41,7 +46,7 @@ tasks:
4146
internal: true
4247
run: "once"
4348
cmds:
44-
- task: ":utils:cmake:install-remote-tar"
49+
- task: "utils:cmake:install-remote-tar"
4550
vars:
4651
CMAKE_PACKAGE_NAME: "Catch2"
4752
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"

taskfiles/lint-cmake.yaml

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

3+
includes:
4+
deps:
5+
internal: true
6+
taskfile: "deps.yaml"
7+
38
tasks:
49
check-cmake:
510
desc: "Runs the CMake linters."
@@ -42,7 +47,7 @@ tasks:
4247
- "FLAGS"
4348
dir: "{{.ROOT_DIR}}"
4449
deps:
45-
- ":deps:install-all" # Allow Gersemi to parse 3rdparty CMake modules for linting
50+
- "deps:install-all" # Allow Gersemi to parse 3rdparty CMake modules for linting
4651
- "venv"
4752
cmds:
4853
- |-

taskfiles/lint-cpp.yaml

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

3+
includes:
4+
ystdlib:
5+
internal: true
6+
taskfile: "ystdlib.yaml"
7+
38
vars:
49
G_CPP_SRC_DIR: "{{.ROOT_DIR}}/src"
510
G_LINT_CLANG_TIDY_DIR: "{{.G_BUILD_DIR}}/lint-clang-tidy"
@@ -30,7 +35,7 @@ tasks:
3035
- "cpp-configs"
3136
- "venv"
3237
cmds:
33-
- task: ":utils:cpp-lint:clang-format"
38+
- task: "utils:cpp-lint:clang-format"
3439
vars:
3540
FLAGS: ["--dry-run"]
3641
INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
@@ -44,7 +49,7 @@ tasks:
4449
- "cpp-configs"
4550
- "venv"
4651
cmds:
47-
- task: ":utils:cpp-lint:clang-format"
52+
- task: "utils:cpp-lint:clang-format"
4853
vars:
4954
FLAGS: ["-i"]
5055
INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
@@ -60,10 +65,13 @@ tasks:
6065
- "fix-cpp-static"
6166
desc: "Runs the C++ static analyzers. Only checks for warnings and violations."
6267
deps:
68+
- task: "ystdlib:generate"
69+
vars:
70+
BUILD_TYPE: "debug"
6371
- "cpp-configs"
6472
- "venv"
6573
cmds:
66-
- task: ":utils:cpp-lint:clang-tidy-find"
74+
- task: "utils:cpp-lint:clang-tidy-find"
6775
vars:
6876
FLAGS:
6977
- "--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}}"]

taskfiles/lint.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ includes:
1010
venv:
1111
flatten: true
1212
taskfile: "./lint-venv.yaml"
13+
utils:
14+
internal: true
15+
taskfile: "../tools/yscope-dev-utils/exports/taskfiles/utils/utils.yaml"
1316
yaml:
1417
flatten: true
1518
taskfile: "./lint-yaml.yaml"

0 commit comments

Comments
 (0)