Skip to content

Commit 62b21b8

Browse files
fix(deps): Update yscope-dev-utils to y-scope/yscope-dev-utils@49e0749 to resolve a race condition in cmake:install-deps-and-generate-settings (fixes #1553). (#1542)
Co-authored-by: davidlion <[email protected]>
1 parent 806a8c1 commit 62b21b8

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

taskfiles/deps/main.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ tasks:
4242
- "utils:clean-outdated-cpp-checksum-files"
4343
- "utils:init"
4444
cmds:
45-
- "rm -rf '{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}'"
46-
- "mkdir -p '{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}'"
4745
- task: "yscope-dev-utils:cmake:install-deps-and-generate-settings"
4846
vars:
4947
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}"
@@ -118,8 +116,6 @@ tasks:
118116
- "utils:clean-outdated-cpp-checksum-files"
119117
- "utils:init"
120118
cmds:
121-
- "rm -rf '{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}'"
122-
- "mkdir -p '{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}'"
123119
- task: "yscope-dev-utils:cmake:install-deps-and-generate-settings"
124120
vars:
125121
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}"

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="f1202b9c21dac05d77632e4d3e1768b11e0dcf47"
13+
readonly YSCOPE_DEV_UTILS_COMMIT_SHA="49e07491790bb9a0adae10b1a125e9fd9b9eb487"
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)