From 4b7f1e9716ba5742402d7276260af65026275bcf Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Mon, 19 Feb 2024 20:51:40 -0500 Subject: [PATCH 01/13] test libuv with posix delete on windows --- deps/checksums/libuv | 38 ++++---------------------------------- deps/libuv.mk | 1 + deps/libuv.version | 4 ++-- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/deps/checksums/libuv b/deps/checksums/libuv index 7ac93952b8b34..e5f6387af869b 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,34 +1,4 @@ -LibUV.v2.0.1+15.aarch64-apple-darwin.tar.gz/md5/f12ee08b8d5721bd88b651ac573c59ed -LibUV.v2.0.1+15.aarch64-apple-darwin.tar.gz/sha512/b3c53e04624d9c60e664db2eaaf3add696f95c52e55db0c577547f7bf7e045ce30cffa0e38c3451f483dcdb7ddcac1b7f43b694dfadb37282773ce416af1030a -LibUV.v2.0.1+15.aarch64-linux-gnu.tar.gz/md5/8cb9f4d6c6a4013fa9ed9ae120058275 -LibUV.v2.0.1+15.aarch64-linux-gnu.tar.gz/sha512/d4213ee47ebdcab4cc4719478608ffa461a5543a16656c2881587364c8ed1b39a2f418d5c3c6a04d7e6dd3df349f0afa72cd1df0e06db6146512356b37637024 -LibUV.v2.0.1+15.aarch64-linux-musl.tar.gz/md5/e23a0d7162fc3f09f0ea92d24cba3f4d -LibUV.v2.0.1+15.aarch64-linux-musl.tar.gz/sha512/f4a13eee72575092ab673777a53d43ce999a7a8bf847daa0a86b39bbfd3f6c1575f105a0bb629766268921ff94f10d354a0e53d32623f6ad35fca44e7bac25f8 -LibUV.v2.0.1+15.armv6l-linux-gnueabihf.tar.gz/md5/70ed0616cd3737a357b7571ab648d239 -LibUV.v2.0.1+15.armv6l-linux-gnueabihf.tar.gz/sha512/25a4b8a90b7bb62e31c1c2bb1d7e137050de26f311daa9f77be932ab3d9a2b92c82ce82ed37cc74a2b1cd5a60bd0dc412e92d31013d36ad35af2d4f376fbc0b0 -LibUV.v2.0.1+15.armv6l-linux-musleabihf.tar.gz/md5/e4320c51c8904a59c105f7b63d086c79 -LibUV.v2.0.1+15.armv6l-linux-musleabihf.tar.gz/sha512/bbc39d800277a66298c56849c1131a6f1958a2c8b2465b59527965a1bd3f36a4c87c1d7ad4be59ec0f4ca8f94ec1804a619eb963d956b77e645e0e00effc6613 -LibUV.v2.0.1+15.armv7l-linux-gnueabihf.tar.gz/md5/d5436552dc177fc3fd0cf4f575cc03b4 -LibUV.v2.0.1+15.armv7l-linux-gnueabihf.tar.gz/sha512/8d3722290151ecf65f4e3fe3440828492a7b115810b87c8711c5592f4dea69727e516228a5a1bdac430c74b288f12de390daf0a9408274aa27cdd69efc81cfee -LibUV.v2.0.1+15.armv7l-linux-musleabihf.tar.gz/md5/67e1ba03ddf2d2bdd79fef25a5976350 -LibUV.v2.0.1+15.armv7l-linux-musleabihf.tar.gz/sha512/535565657b5714da0db5c622b65b261a77f21f407b1166eee99f35ba3bb9c6fab4c7d1f3db70528767cef7c66c856c5101b01423be05efb9219ec4c76df0be6a -LibUV.v2.0.1+15.i686-linux-gnu.tar.gz/md5/ba1432ecd75e6a43ff197d51ba76446c -LibUV.v2.0.1+15.i686-linux-gnu.tar.gz/sha512/dc8940284d4ba05098037fcf4b3bada199878794ef34ad09d8992ef58e4c829b00a3fcca29c4f65b49edcab4274092232ff5d7619b3535333125043f89503cfc -LibUV.v2.0.1+15.i686-linux-musl.tar.gz/md5/237080cf5d1286a3d2f35d134a285d28 -LibUV.v2.0.1+15.i686-linux-musl.tar.gz/sha512/834f16a16cf6b765dfd094037c8a45ccdedc2eb9e45f527c6721eb0f60f4e56dc4f9b90a2a35e3ed10da4a937d8555e97034e0a29d733cac5352061ebe286799 -LibUV.v2.0.1+15.i686-w64-mingw32.tar.gz/md5/8a5261a6ce4200d272b5eda4fe9ecb31 -LibUV.v2.0.1+15.i686-w64-mingw32.tar.gz/sha512/b372b9368a9ac92775a8d6ee39b492905dc5f58f16d7edf792e0c2ffbd4507ede79139a24fe852dfa26068d0f076a4abf3c3b868a8a057b23fdbad80999d315f -LibUV.v2.0.1+15.powerpc64le-linux-gnu.tar.gz/md5/53db7b763af204477ce8f0bfae0ce15c -LibUV.v2.0.1+15.powerpc64le-linux-gnu.tar.gz/sha512/bbfe2518d4dc84fe73b7d3f3bcaf5aeef0db0d284c0e205e3e3670b8ce6f3ea593a0e52d125fd9a79cd098dba0d35f151cb46469fa25dfeef62ebcc966f94d4f -LibUV.v2.0.1+15.x86_64-apple-darwin.tar.gz/md5/b4699192c098564edc5589e90c47324e -LibUV.v2.0.1+15.x86_64-apple-darwin.tar.gz/sha512/2505e4060712143d3213747d4276c0b99dec78579d2ab0b71c5d7edf15ae80e0178138a11470c976d97de14e44b153dcb00c08c864523d7ee0ead8e48cf15d14 -LibUV.v2.0.1+15.x86_64-linux-gnu.tar.gz/md5/f5515c50106a0748b9a1986c912a00f3 -LibUV.v2.0.1+15.x86_64-linux-gnu.tar.gz/sha512/5822396039e14a5d919f2612559a8d62a925c4319e66eb05ed20faed754318762f5653851684701cd4ddb1edf10bfe25d252c3d9cd84228e498e825ba61146b1 -LibUV.v2.0.1+15.x86_64-linux-musl.tar.gz/md5/1962e6f21080e874d2ca0275c5b569b2 -LibUV.v2.0.1+15.x86_64-linux-musl.tar.gz/sha512/4702e13633d77a6c0aeb1e7cd252471a779177e20c68485130f420cc4878c8f7de7f0f51730008ba9dc0f275875a5947629d39aff200691e26f31d42e388d53d -LibUV.v2.0.1+15.x86_64-unknown-freebsd.tar.gz/md5/928a789c3cd3b4cefcc1cf13f5f179ac -LibUV.v2.0.1+15.x86_64-unknown-freebsd.tar.gz/sha512/ee58667b19fdf7ec0218b4645b3f5bed2e9fc01cc29eab8473ee02aaa044f94a48eb220c6427200aaf56eacf52d0f72156712d17017cfecbc25d3c1b71a4bd2f -LibUV.v2.0.1+15.x86_64-w64-mingw32.tar.gz/md5/d3b84729ee9d5a6e6a1e29357e25cced -LibUV.v2.0.1+15.x86_64-w64-mingw32.tar.gz/sha512/43ca5999d8e8ff820722b1a548bd4e277e95c739c3363ed6159d080dd06842316f5370e8e4f4a886bf76010f4aed2bbf01f6091845b0e84b75f709277c561649 -libuv-afa1c67fa496eb49ade1e520f76fd018a1409eaa.tar.gz/md5/3863ccd5a51f85cf76679070c99be6cd -libuv-afa1c67fa496eb49ade1e520f76fd018a1409eaa.tar.gz/sha512/bf4c705e05e730139b62de799331653eea2767898d654b8890ca2623db3adb9a1efcfcfab38af22e8ac44c67a9c5c018f1f7847a3703bee5f05657169a67d817 +libuv-7be33d0a9f8a7be9431a379fe625d2b8fbd5222b.tar.gz/md5/72246fce83e6dc70cb55518ec5414595 +libuv-7be33d0a9f8a7be9431a379fe625d2b8fbd5222b.tar.gz/sha512/3252a7ca388d42b2c9347904b5d17216310dcb8ee9dc3ee4c8bf2f557b46d49e2937eb9eaf5fe01199c9e4b1477fb5e724bac8c02715721d4f65714460123c3a +libuv.mk/md5/ +libuv.mk/sha512/ diff --git a/deps/libuv.mk b/deps/libuv.mk index eacabac55e34f..7665ceddcb34b 100644 --- a/deps/libuv.mk +++ b/deps/libuv.mk @@ -1,4 +1,5 @@ ## LIBUV ## +override USE_BINARYBUILDER_LIBUV=0 ifneq ($(USE_BINARYBUILDER_LIBUV),1) LIBUV_GIT_URL:=https://github.com/JuliaLang/libuv.git LIBUV_TAR_URL=https://api.github.com/repos/JuliaLang/libuv/tarball/$1 diff --git a/deps/libuv.version b/deps/libuv.version index 9ae54aa7be91a..2073322f25d9e 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -3,5 +3,5 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 -LIBUV_BRANCH=julia-uv2-1.48.0 -LIBUV_SHA1=afa1c67fa496eb49ade1e520f76fd018a1409eaa +LIBUV_BRANCH=ib/posix_rm_test +LIBUV_SHA1=7be33d0a9f8a7be9431a379fe625d2b8fbd5222b From 57716b8669c9024d7a2497276feb788812ea15b5 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Tue, 20 Feb 2024 10:48:03 -0500 Subject: [PATCH 02/13] update to commit with debug print on fallback --- deps/checksums/libuv | 6 ++---- deps/libuv.version | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/deps/checksums/libuv b/deps/checksums/libuv index e5f6387af869b..db6201bcaddb4 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,4 +1,2 @@ -libuv-7be33d0a9f8a7be9431a379fe625d2b8fbd5222b.tar.gz/md5/72246fce83e6dc70cb55518ec5414595 -libuv-7be33d0a9f8a7be9431a379fe625d2b8fbd5222b.tar.gz/sha512/3252a7ca388d42b2c9347904b5d17216310dcb8ee9dc3ee4c8bf2f557b46d49e2937eb9eaf5fe01199c9e4b1477fb5e724bac8c02715721d4f65714460123c3a -libuv.mk/md5/ -libuv.mk/sha512/ +libuv-27869f4e9e64610eadc17b959b31742f8d3434a7.tar.gz/md5/b2f672f3b801eee731b305db09d494c0 +libuv-27869f4e9e64610eadc17b959b31742f8d3434a7.tar.gz/sha512/df3fc378b7530f2ee64672c974869ce0952bb2b7841bd074935d12e1ed0892c5949a54ce982340c8a452d0177c562e4b07c67fa9ce2ea93b31eef1f6bcaeb0f5 diff --git a/deps/libuv.version b/deps/libuv.version index 2073322f25d9e..eff35db802535 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -4,4 +4,4 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 LIBUV_BRANCH=ib/posix_rm_test -LIBUV_SHA1=7be33d0a9f8a7be9431a379fe625d2b8fbd5222b +LIBUV_SHA1=27869f4e9e64610eadc17b959b31742f8d3434a7 From 9ac2009540f088718d8073c081866d9d36fc9fd3 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Tue, 20 Feb 2024 21:03:26 -0500 Subject: [PATCH 03/13] try with posix rmdir --- deps/checksums/libuv | 4 ++-- deps/libuv.version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/checksums/libuv b/deps/checksums/libuv index db6201bcaddb4..10bc729ffa814 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,2 +1,2 @@ -libuv-27869f4e9e64610eadc17b959b31742f8d3434a7.tar.gz/md5/b2f672f3b801eee731b305db09d494c0 -libuv-27869f4e9e64610eadc17b959b31742f8d3434a7.tar.gz/sha512/df3fc378b7530f2ee64672c974869ce0952bb2b7841bd074935d12e1ed0892c5949a54ce982340c8a452d0177c562e4b07c67fa9ce2ea93b31eef1f6bcaeb0f5 +libuv-ab6f1ec725dfb5c8a25f4b94af9862d36ea49b9d.tar.gz/md5/0a8779697f13017d85f6e55dad68848c +libuv-ab6f1ec725dfb5c8a25f4b94af9862d36ea49b9d.tar.gz/sha512/fbb481b1a75b67d805af4cf3f4f8237d29774b850d65ac65431301017b33bfbc9bba615ebac8fb3b8b7f6e878dc36bf455f64f9c899ecc58a8f48e9e11f9078f diff --git a/deps/libuv.version b/deps/libuv.version index eff35db802535..d748342f81b0c 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -4,4 +4,4 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 LIBUV_BRANCH=ib/posix_rm_test -LIBUV_SHA1=27869f4e9e64610eadc17b959b31742f8d3434a7 +LIBUV_SHA1=ab6f1ec725dfb5c8a25f4b94af9862d36ea49b9d From 807e3918b5e70b5961a974bba5dbf62aeb44bbe3 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Wed, 21 Feb 2024 21:40:52 -0500 Subject: [PATCH 04/13] try latest with posix rmdir --- deps/checksums/libuv | 4 ++-- deps/libuv.version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/checksums/libuv b/deps/checksums/libuv index 10bc729ffa814..c319eea1a0d42 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,2 +1,2 @@ -libuv-ab6f1ec725dfb5c8a25f4b94af9862d36ea49b9d.tar.gz/md5/0a8779697f13017d85f6e55dad68848c -libuv-ab6f1ec725dfb5c8a25f4b94af9862d36ea49b9d.tar.gz/sha512/fbb481b1a75b67d805af4cf3f4f8237d29774b850d65ac65431301017b33bfbc9bba615ebac8fb3b8b7f6e878dc36bf455f64f9c899ecc58a8f48e9e11f9078f +libuv-a4f569267cbcea83708cb919cd1564bde554cf77.tar.gz/md5/7a9afc5c9a5e74e8928b197e8f78a89c +libuv-a4f569267cbcea83708cb919cd1564bde554cf77.tar.gz/sha512/f41f7c124d769d474f8265be55d1ac03d2d10cc21c1d5b08532a51ffae9ffd84224198743311ef530f31aa02e93367b94c570de10d9e5ec0bd4f98f56304f0ec diff --git a/deps/libuv.version b/deps/libuv.version index d748342f81b0c..347a2e716645a 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -4,4 +4,4 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 LIBUV_BRANCH=ib/posix_rm_test -LIBUV_SHA1=ab6f1ec725dfb5c8a25f4b94af9862d36ea49b9d +LIBUV_SHA1=a4f569267cbcea83708cb919cd1564bde554cf77 From 7478219c079f53afbf7faff06bce935f38724b84 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Thu, 22 Feb 2024 10:57:08 -0500 Subject: [PATCH 05/13] try with some debug prints --- deps/checksums/libuv | 4 ++-- deps/libuv.version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/checksums/libuv b/deps/checksums/libuv index c319eea1a0d42..aba8fd99669ec 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,2 +1,2 @@ -libuv-a4f569267cbcea83708cb919cd1564bde554cf77.tar.gz/md5/7a9afc5c9a5e74e8928b197e8f78a89c -libuv-a4f569267cbcea83708cb919cd1564bde554cf77.tar.gz/sha512/f41f7c124d769d474f8265be55d1ac03d2d10cc21c1d5b08532a51ffae9ffd84224198743311ef530f31aa02e93367b94c570de10d9e5ec0bd4f98f56304f0ec +libuv-2c35bf30acf455e25aecdc7b9e44585bcf243f0b.tar.gz/md5/348742842b58ae77eb04168b4120662a +libuv-2c35bf30acf455e25aecdc7b9e44585bcf243f0b.tar.gz/sha512/107eb0bb2014df0eb9c0233fb1d33be86f48ac52bdfbaac8f53ed8053eee29d981769d02f3dec99b47371ffcf1b1385b7fd34f1ce0e5e81344258c05ebf8f4fc diff --git a/deps/libuv.version b/deps/libuv.version index 347a2e716645a..e6311a0415d39 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -4,4 +4,4 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 LIBUV_BRANCH=ib/posix_rm_test -LIBUV_SHA1=a4f569267cbcea83708cb919cd1564bde554cf77 +LIBUV_SHA1=2c35bf30acf455e25aecdc7b9e44585bcf243f0b From b0d8ea902f7092c94bf8cf49e6d62877d8ce2b3c Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Thu, 22 Feb 2024 12:04:48 -0500 Subject: [PATCH 06/13] fix vague `@show err`s --- test/compiler/contextual.jl | 2 +- test/loading.jl | 4 ++-- test/precompile.jl | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/compiler/contextual.jl b/test/compiler/contextual.jl index bbcf7b0dfb959..68233ebf775b9 100644 --- a/test/compiler/contextual.jl +++ b/test/compiler/contextual.jl @@ -198,7 +198,7 @@ finally try rm(depot_path, force=true, recursive=true) catch err - @show err + @warn "contextual tests failed to tidy up" err end end diff --git a/test/loading.jl b/test/loading.jl index 4a72a0f8060ad..43c8ac0295b60 100644 --- a/test/loading.jl +++ b/test/loading.jl @@ -756,7 +756,7 @@ for depot in depots try rm(depot, force=true, recursive=true) catch err - @show err + @warn "Error while cleaning up after tests" err end end @@ -1147,7 +1147,7 @@ end try rm(depot_path, force=true, recursive=true) catch err - @show err + @warn "Extensions testset failed to tidy up" err end end end diff --git a/test/precompile.jl b/test/precompile.jl index a68d8936d1ed1..232b693d075de 100644 --- a/test/precompile.jl +++ b/test/precompile.jl @@ -32,13 +32,13 @@ function precompile_test_harness(@nospecialize(f), separate::Bool) try rm(load_path, force=true, recursive=true) catch err - @show err + @warn "precompile_test_harness failed to tidy up" err end if separate try rm(load_cache_path, force=true, recursive=true) catch err - @show err + @warn "precompile_test_harness failed to tidy up" err end end filter!((≠)(load_path), LOAD_PATH) @@ -1415,7 +1415,7 @@ end try rm(temp_path, recursive=true) catch err - @show err + @warn "precompile test failed to tidy up" err end pop!(test_workers) # remove myid rmprocs(test_workers) From e57c69d953962163c962d246167d00269326bdee Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Thu, 22 Feb 2024 14:23:36 -0500 Subject: [PATCH 07/13] move catch to inside recursive loop --- base/file.jl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/base/file.jl b/base/file.jl index 6347f042e3422..12a6e8907011b 100644 --- a/base/file.jl +++ b/base/file.jl @@ -289,13 +289,14 @@ function rm(path::AbstractString; force::Bool=false, recursive::Bool=false) end else if recursive - try - for p in readdir(path) - rm(joinpath(path, p), force=force, recursive=true) - end - catch err - if !(isa(err, IOError) && err.code==Base.UV_EACCES) - rethrow(err) + for p in readdir(path) + fp = joinpath(path, p) + try + rm(fp, force=force, recursive=true) + catch err + if !(isa(err, IOError) && err.code==Base.UV_EACCES) + rethrow() + end end end end From b1c5f1bd5a9ba2951ea92b192cd01df2cd3b2632 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Thu, 22 Feb 2024 14:23:44 -0500 Subject: [PATCH 08/13] add debug log --- base/file.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/file.jl b/base/file.jl index 12a6e8907011b..5b7fbfa2bf0e0 100644 --- a/base/file.jl +++ b/base/file.jl @@ -296,6 +296,8 @@ function rm(path::AbstractString; force::Bool=false, recursive::Bool=false) catch err if !(isa(err, IOError) && err.code==Base.UV_EACCES) rethrow() + else + @warn "Cannot delete due to UV_EACCES: $fp" stat(fp) end end end From 72b826b0b7977ed5213423133fa085c6284b737f Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Thu, 22 Feb 2024 21:36:35 -0500 Subject: [PATCH 09/13] more debugs --- deps/checksums/libuv | 4 ++-- deps/libuv.version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/checksums/libuv b/deps/checksums/libuv index aba8fd99669ec..67b6ab515baa0 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,2 +1,2 @@ -libuv-2c35bf30acf455e25aecdc7b9e44585bcf243f0b.tar.gz/md5/348742842b58ae77eb04168b4120662a -libuv-2c35bf30acf455e25aecdc7b9e44585bcf243f0b.tar.gz/sha512/107eb0bb2014df0eb9c0233fb1d33be86f48ac52bdfbaac8f53ed8053eee29d981769d02f3dec99b47371ffcf1b1385b7fd34f1ce0e5e81344258c05ebf8f4fc +libuv-d01b381d4a6d71afdd50e98497e2caf0d0a5de8b.tar.gz/md5/a60d275c01289af70a86f911ff0832b8 +libuv-d01b381d4a6d71afdd50e98497e2caf0d0a5de8b.tar.gz/sha512/00fd6bf3797bceaf6f0e5c988add6cc3dc81c03c1076327faf9f6c2b94580a4f762d3fab554bfea69db1ed2f7699eb77253c4d3e986ce41f4491468ead8e3e20 diff --git a/deps/libuv.version b/deps/libuv.version index e6311a0415d39..be39234f22367 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -4,4 +4,4 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 LIBUV_BRANCH=ib/posix_rm_test -LIBUV_SHA1=2c35bf30acf455e25aecdc7b9e44585bcf243f0b +LIBUV_SHA1=d01b381d4a6d71afdd50e98497e2caf0d0a5de8b From 2fe8c79f72438efc6b60d944a7a6a2fb247b2300 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Fri, 23 Feb 2024 15:02:42 -0500 Subject: [PATCH 10/13] try latest libuv changes --- deps/checksums/libuv | 4 ++-- deps/libuv.version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/checksums/libuv b/deps/checksums/libuv index 67b6ab515baa0..d4ce5b481c393 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,2 +1,2 @@ -libuv-d01b381d4a6d71afdd50e98497e2caf0d0a5de8b.tar.gz/md5/a60d275c01289af70a86f911ff0832b8 -libuv-d01b381d4a6d71afdd50e98497e2caf0d0a5de8b.tar.gz/sha512/00fd6bf3797bceaf6f0e5c988add6cc3dc81c03c1076327faf9f6c2b94580a4f762d3fab554bfea69db1ed2f7699eb77253c4d3e986ce41f4491468ead8e3e20 +libuv-7d5a80d35512b12973d7fed4f36dc9044a27e14a.tar.gz/md5/6a5f462187d74af0e0982bd5d7970fa4 +libuv-7d5a80d35512b12973d7fed4f36dc9044a27e14a.tar.gz/sha512/bad32a60d48bd6eb063c4605bbc44afd2e15a6a4232240586fa26feb4e83d032d794abbe2ce15970129c6c03ad9ccd57a4f447fd486ea440ca5784d7e56ec96f diff --git a/deps/libuv.version b/deps/libuv.version index be39234f22367..4ab43b21bc935 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -4,4 +4,4 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 LIBUV_BRANCH=ib/posix_rm_test -LIBUV_SHA1=d01b381d4a6d71afdd50e98497e2caf0d0a5de8b +LIBUV_SHA1=7d5a80d35512b12973d7fed4f36dc9044a27e14a From 5f236f3995feb3835d88ea57b47e03e6024daa90 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Fri, 23 Feb 2024 18:43:11 -0500 Subject: [PATCH 11/13] try removing windows filemode writable before delete --- base/file.jl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/base/file.jl b/base/file.jl index 5b7fbfa2bf0e0..7c866fe7ed5cb 100644 --- a/base/file.jl +++ b/base/file.jl @@ -273,13 +273,6 @@ Stacktrace: function rm(path::AbstractString; force::Bool=false, recursive::Bool=false) if islink(path) || !isdir(path) try - @static if Sys.iswindows() - # is writable on windows actually means "is deletable" - st = lstat(path) - if ispath(st) && (filemode(st) & 0o222) == 0 - chmod(path, 0o777) - end - end unlink(path) catch err if force && isa(err, IOError) && err.code==Base.UV_ENOENT From 2cac434987b512505885e0550acc444c8225271f Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Fri, 23 Feb 2024 19:36:09 -0500 Subject: [PATCH 12/13] more debug --- base/file.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/file.jl b/base/file.jl index 7c866fe7ed5cb..50c0e87fbd4c6 100644 --- a/base/file.jl +++ b/base/file.jl @@ -271,6 +271,7 @@ Stacktrace: ``` """ function rm(path::AbstractString; force::Bool=false, recursive::Bool=false) + @info "rm $path" if islink(path) || !isdir(path) try unlink(path) @@ -1024,6 +1025,7 @@ function walkdir(root; topdown=true, follow_symlinks=false, onerror=throw) end function unlink(p::AbstractString) + @info "unlink $p" err = ccall(:jl_fs_unlink, Int32, (Cstring,), p) err < 0 && uv_error("unlink($(repr(p)))", err) nothing From 82b295de263d1f357ec64edc898c1757d9ee9463 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Fri, 23 Feb 2024 21:09:34 -0500 Subject: [PATCH 13/13] try libuv that handles STATUS_CANNOT_DELETE --- deps/checksums/libuv | 4 ++-- deps/libuv.version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/checksums/libuv b/deps/checksums/libuv index d4ce5b481c393..192b3386855db 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,2 +1,2 @@ -libuv-7d5a80d35512b12973d7fed4f36dc9044a27e14a.tar.gz/md5/6a5f462187d74af0e0982bd5d7970fa4 -libuv-7d5a80d35512b12973d7fed4f36dc9044a27e14a.tar.gz/sha512/bad32a60d48bd6eb063c4605bbc44afd2e15a6a4232240586fa26feb4e83d032d794abbe2ce15970129c6c03ad9ccd57a4f447fd486ea440ca5784d7e56ec96f +libuv-afced9f5206b6de0002201cee9012028ea468d2f.tar.gz/md5/0ea602aaca3a5a88b3991a52bbea8521 +libuv-afced9f5206b6de0002201cee9012028ea468d2f.tar.gz/sha512/5147597b8cee7066c098f74010a36dc57757e60aa742134cf2313042f020ac9e3395c2d799d4ccc3623728d1685402a774b1c1a25041ad4580c01c32a0f49a21 diff --git a/deps/libuv.version b/deps/libuv.version index 4ab43b21bc935..bcd33f33e62e4 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -4,4 +4,4 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 LIBUV_BRANCH=ib/posix_rm_test -LIBUV_SHA1=7d5a80d35512b12973d7fed4f36dc9044a27e14a +LIBUV_SHA1=afced9f5206b6de0002201cee9012028ea468d2f