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

Jump to bottom

Check in busybox to avoid historically flakey download in CI and simplify process #51529

Closed
wants to merge 3 commits into from
Closed

Check in busybox to avoid historically flakey download in CI and simplify process #51529

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22b5197
Check in busybox because these downloads have been causing troubles f…
Sep 30, 2023
418dadf
fix some bugs
Sep 30, 2023
bbbb491
Merge branch 'master' into lh/checkin-busybox
LilithHafner Oct 4, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
*.jl.*.mem
*.ji

!busybox.exe

/perf*
.DS_Store
.idea/*
Expand Down
Binary file added test/deps/busybox.exe
View file
Open in desktop
Binary file not shown.
64 changes: 13 additions & 51 deletions test/spawn.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
###################################

using Random, Sockets
using Downloads: Downloads, download

valgrind_off = ccall(:jl_running_on_valgrind, Cint, ()) == 0

Expand All @@ -21,50 +20,20 @@ sleepcmd = `sleep`
lscmd = `ls`
havebb = false

function _tryonce_download_from_cache(desired_url::AbstractString)
cache_url = "https://cache.julialang.org/foo/$(desired_url)"
cache_output_filename = joinpath(mktempdir(), "myfile")
cache_response = Downloads.request(
cache_url;
output = cache_output_filename,
throw = false,
timeout = 60,
)
if cache_response isa Downloads.Response
if Downloads.status_ok(cache_response.proto, cache_response.status)
return cache_output_filename
end
end
return Downloads.download(desired_url; timeout = 60)
end

function download_from_cache(desired_url::AbstractString)
f = () -> _tryonce_download_from_cache(desired_url)
delays = Float64[30, 30, 60, 60, 60]
g = retry(f; delays)
return g()
end

if Sys.iswindows()
busybox = download_from_cache("https://frippery.org/files/busybox/busybox.exe")
havebb = try # use busybox-w32 on windows, if available
success(`$busybox`)
true
catch
false
end
if havebb
yescmd = `$busybox yes`
echocmd = `$busybox echo`
sortcmd = `$busybox sort`
printfcmd = `$busybox printf`
truecmd = `$busybox true`
falsecmd = `$busybox false`
catcmd = `$busybox cat`
shcmd = `$busybox sh`
sleepcmd = `$busybox sleep`
lscmd = `$busybox ls`
end
busybox = joinpath(@__DIR__, "deps", "busybox.exe")
havebb = true

yescmd = `$busybox yes`
echocmd = `$busybox echo`
sortcmd = `$busybox sort`
printfcmd = `$busybox printf`
truecmd = `$busybox true`
falsecmd = `$busybox false`
catcmd = `$busybox cat`
shcmd = `$busybox sh`
sleepcmd = `$busybox sleep`
lscmd = `$busybox ls`
end

#### Examples used in the manual ####
Expand Down Expand Up @@ -878,13 +847,6 @@ end
@test setenv(cmd, Dict("FOO"=>"foo"); dir="").dir == ""
end


# clean up busybox download
if Sys.iswindows()
rm(busybox, force=true)
end


# test (t)csh escaping if tcsh is installed
cshcmd = "/bin/tcsh"
if isfile(cshcmd)
Expand Down
Loading