Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(block/list): update deps to get safeMountIter fix #1639

Merged
merged 2 commits into from
Apr 18, 2024
Merged

fix(block/list): update deps to get safeMountIter fix #1639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddba1ec
fix(block/list): update deps to get safeMountIter fix
tiagolobocastro Apr 18, 2024
a06f37c
build: support relative cargo-vendor-dir path with non-existing
tiagolobocastro Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,18 @@ pre_fetch_cargo_deps() {

local outLink="--no-out-link"
local cargoVendorMsg=""
local cargoVendorDir=""
if [ -n "$CARGO_VENDOR_DIR" ]; then
if [ "$(realpath -s "$CARGO_VENDOR_DIR")" = "$(realpath -s "$SCRIPTDIR/..")" ]; then
if [ "$(realpath -ms "$CARGO_VENDOR_DIR")" = "$(realpath -ms "$SCRIPTDIR/..")" ]; then
cargoVendorDir="$CARGO_VENDOR_DIR/$GIT_BRANCH"
else
cargoVendorDir="$CARGO_VENDOR_DIR/$project/$GIT_BRANCH"
fi

cargoVendorMsg="into $(realpath -ms "$cargoVendorDir") "
outLink="--out-link "$cargoVendorDir""
fi

for (( attempt=1; attempt<=maxAttempt; attempt++ )); do
if $NIX_BUILD $outLink -A "$nixAttrPath"; then
[ -n "$cargoVendorDir" ] && cargoVendorMsg="into $(realpath -s "$cargoVendorDir") "
echo "Cargo vendored dependencies pre-fetched "$cargoVendorMsg"after $attempt attempt(s)"
return 0
fi
Expand Down
2 changes: 1 addition & 1 deletion utils/dependencies
Open in desktop
Submodule dependencies updated 6 files
+5 −5 .github/workflows/pr-rust-lint.yaml
+2 −0 apis/io-engine/src/v1.rs
+0 −41 devinfo/src/mountinfo/bytebuf.rs
+22 −12 devinfo/src/mountinfo/mod.rs
+4 −1 prost-extend/src/duration.rs
+1 −1 scripts/rust/style.sh
Loading