diff --git a/Taskfile.yml b/Taskfile.yml index 5c20ef4603..d3f07b5d3e 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -4,7 +4,7 @@ includes: deps: "deps-tasks.yml" docs: "docs/tasks.yml" lint: "lint-tasks.yml" - utils: "tools/yscope-dev-utils/taskfiles/utils.yml" + utils: "tools/yscope-dev-utils/taskfiles/utils.yaml" vars: # Source paths @@ -27,7 +27,7 @@ vars: G_WEBUI_BUILD_DIR: "{{.G_BUILD_DIR}}/webui" # Taskfile paths - G_UTILS_TASKFILE: "{{.ROOT_DIR}}/tools/yscope-dev-utils/taskfiles/utils.yml" + G_UTILS_TASKFILE: "{{.ROOT_DIR}}/tools/yscope-dev-utils/taskfiles/utils.yaml" # Versions G_PACKAGE_VERSION: "0.2.0-dev" @@ -116,7 +116,7 @@ tasks: - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] - "webui" cmds: - "rm -rf '{{.OUTPUT_DIR}}'" @@ -173,8 +173,8 @@ tasks: # This command must be last - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] core: vars: @@ -242,7 +242,7 @@ tasks: - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] cmds: - "rm -rf '{{.OUTPUT_DIR}}'" - for: @@ -254,8 +254,8 @@ tasks: --output-path "{{.OUTPUT_DIR}}/{{.ITEM}}" - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] webui: vars: @@ -280,7 +280,7 @@ tasks: - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] - "webui-node-modules" cmds: - "rm -rf '{{.OUTPUT_DIR}}'" @@ -298,8 +298,8 @@ tasks: # This command must be last - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] nodejs-22: internal: true @@ -342,7 +342,7 @@ tasks: - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] cmds: - "rm -rf '{{.OUTPUT_DIR}}' '{{.OUTPUT_TMP_DIR}}'" - "mkdir -p '{{.OUTPUT_TMP_DIR}}'" @@ -356,8 +356,8 @@ tasks: # This command must be last - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] # NOTE: The log-viewer-webui has four different node_modules directories: # * client @@ -407,19 +407,19 @@ tasks: - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CLIENT_CHECKSUM_FILE}}" - DATA_DIR: "{{.CLIENT_OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.CLIENT_OUTPUT_DIR}}"] - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.SERVER_CHECKSUM_FILE}}" - DATA_DIR: "{{.SERVER_OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.SERVER_OUTPUT_DIR}}"] - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.PACKAGE_CHECKSUM_FILE}}" - DATA_DIR: "{{.PACKAGE_OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.PACKAGE_OUTPUT_DIR}}"] - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.LOG_VIEWER_CHECKSUM_FILE}}" - DATA_DIR: "{{.LOG_VIEWER_OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.LOG_VIEWER_OUTPUT_DIR}}"] cmds: - "rm -f {{.CHECKSUM_FILE}}" - task: "clean-log-viewer-webui" @@ -430,20 +430,20 @@ tasks: # These commands must be last - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.CLIENT_OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CLIENT_CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CLIENT_CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.CLIENT_OUTPUT_DIR}}"] - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.LOG_VIEWER_OUTPUT_DIR}}" - OUTPUT_FILE: "{{.LOG_VIEWER_CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.LOG_VIEWER_CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.LOG_VIEWER_OUTPUT_DIR}}"] - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.PACKAGE_OUTPUT_DIR}}" - OUTPUT_FILE: "{{.PACKAGE_CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.PACKAGE_CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.PACKAGE_OUTPUT_DIR}}"] - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.SERVER_OUTPUT_DIR}}" - OUTPUT_FILE: "{{.SERVER_CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.SERVER_CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.SERVER_OUTPUT_DIR}}"] # This command must be last - >- cat @@ -550,18 +550,18 @@ tasks: - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] cmds: - task: "utils:create-venv" vars: LABEL: "package" OUTPUT_DIR: "{{.OUTPUT_DIR}}" - REQUIREMENTS_FILE: "requirements.txt" + REQUIREMENTS_FILE: "{{.ROOT_DIR}}/requirements.txt" # This command must be last - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] python-component: internal: true @@ -614,15 +614,15 @@ tasks: - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] cmds: - "rm -rf '{{.OUTPUT_DIR}}'" - "PATH='{{.G_METEOR_BUILD_DIR}}':$PATH meteor npm install --production" # This command must be last - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] component-venv: internal: true @@ -643,7 +643,7 @@ tasks: - task: "utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] cmds: - task: "utils:create-venv" vars: @@ -653,8 +653,8 @@ tasks: # This command must be last - task: "utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] clean-python-component: internal: true label: "clean-{{.COMPONENT}}" diff --git a/deps-tasks.yml b/deps-tasks.yml index 3c60af0017..5c1e07b0a1 100644 --- a/deps-tasks.yml +++ b/deps-tasks.yml @@ -112,7 +112,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -123,8 +123,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] antlr4: internal: true @@ -143,7 +143,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST_DIR}}" + INCLUDE_PATTERNS: ["{{.DEST_DIR}}"] cmds: - task: "download-dependency" vars: @@ -154,8 +154,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST_DIR}}"] Catch2: internal: true @@ -173,7 +173,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -184,8 +184,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] date: internal: true @@ -203,7 +203,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -214,8 +214,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] json: internal: true @@ -233,7 +233,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -244,8 +244,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] log-surgeon: internal: true @@ -263,7 +263,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -274,8 +274,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] outcome: internal: true @@ -293,7 +293,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -304,8 +304,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] simdjson: internal: true @@ -323,7 +323,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -334,8 +334,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] # We don't use a git submodule for sqlite3 since that would require building the sqlite # amalgamation @@ -355,7 +355,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -366,8 +366,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] yaml-cpp: internal: true @@ -385,7 +385,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -396,8 +396,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] yscope-log-viewer: internal: true @@ -415,7 +415,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.DEST}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] cmds: - task: "download-dependency" vars: @@ -426,8 +426,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.DEST}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.DEST}}"] download-dependency: internal: true diff --git a/docs/tasks.yml b/docs/tasks.yml index 45e2cf05ea..12cbf403cd 100644 --- a/docs/tasks.yml +++ b/docs/tasks.yml @@ -28,7 +28,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] - "docs-venv" cmds: # Call `clean` before building since `sphinx-build --write-all --fresh-env` isn't always @@ -49,8 +49,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] sources: - "{{.G_BUILD_DIR}}/docs-venv.md5" - "{{.ROOT_DIR}}/Taskfile.yml" @@ -64,13 +64,13 @@ tasks: vars: CHECKSUM_FILE: "{{.G_BUILD_DIR}}/{{.TASK | replace \":\" \"#\"}}.md5" OUTPUT_DIR: "{{.G_DOCS_VENV_DIR}}" - REQUIREMENTS_FILE: "docs/requirements.txt" + REQUIREMENTS_FILE: "{{.ROOT_DIR}}/docs/requirements.txt" deps: - ":init" - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] cmds: - task: ":utils:create-venv" vars: @@ -80,8 +80,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] sources: - "{{.REQUIREMENTS_FILE}}" - "{{.ROOT_DIR}}/Taskfile.yml" @@ -98,15 +98,15 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] cmds: - "rm -rf '{{.OUTPUT_DIR}}'" - "npm --prefix '{{.OUTPUT_DIR}}' install http-server" # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] sources: - "{{.ROOT_DIR}}/Taskfile.yml" - "{{.TASKFILE}}" diff --git a/lint-tasks.yml b/lint-tasks.yml index 365a4ee065..f614f03f70 100644 --- a/lint-tasks.yml +++ b/lint-tasks.yml @@ -188,7 +188,7 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] - ":nodejs-22" cmds: - "rm -rf '{{.OUTPUT_DIR}}'" @@ -196,8 +196,8 @@ tasks: # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] venv: internal: true @@ -214,15 +214,15 @@ tasks: - task: ":utils:validate-checksum" vars: CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" - DATA_DIR: "{{.OUTPUT_DIR}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] cmds: - task: ":utils:create-venv" vars: LABEL: "lint" OUTPUT_DIR: "{{.OUTPUT_DIR}}" - REQUIREMENTS_FILE: "lint-requirements.txt" + REQUIREMENTS_FILE: "{{.ROOT_DIR}}/lint-requirements.txt" # This command must be last - task: ":utils:compute-checksum" vars: - DATA_DIR: "{{.OUTPUT_DIR}}" - OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"] diff --git a/tools/yscope-dev-utils b/tools/yscope-dev-utils index c1593f7414..c8b5d5c265 160000 --- a/tools/yscope-dev-utils +++ b/tools/yscope-dev-utils @@ -1 +1 @@ -Subproject commit c1593f7414112f2b6e0bf46595126c8edeffe106 +Subproject commit c8b5d5c26506a1db8d5ec0f183f4e5fa7417fb66