Skip to content

Commit

Permalink
Merge branch 'main' into fix-installer-crash
Browse files Browse the repository at this point in the history
  • Loading branch information
Gambitier authored Jun 29, 2024
2 parents 0719267 + 06130a6 commit dc7266a
Show file tree
Hide file tree
Showing 15 changed files with 477 additions and 238 deletions.
292 changes: 192 additions & 100 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ path-absolutize = "3.1.0"
human-sort = "0.2.2"

[target.'cfg(windows)'.dependencies]
windows = { version = "0.56.0", features = ["Win32_Foundation", "Win32_UI_Shell", "Win32_System_Console", "Services_Store", "Foundation", "Foundation_Collections", "Web_Http", "Web_Http_Headers", "Storage_Streams",] }
windows = { version = "0.57.0", features = ["Win32_Foundation", "Win32_UI_Shell", "Win32_System_Console", "Services_Store", "Foundation", "Foundation_Collections", "Web_Http", "Web_Http_Headers", "Storage_Streams",] }

[target.'cfg(target_os = "macos")'.dependencies]
reqwest = { version = "0.12.3", default-features = false, features = ["blocking", "native-tls", "socks"] }
Expand Down
41 changes: 28 additions & 13 deletions versiondb/versiondb-aarch64-apple-darwin.json
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,12 @@
},
"1.11.0-beta2+0.x64.apple.darwin14": {
"UrlPath": "bin/mac/x64/1.11/julia-1.11.0-beta2-mac64.tar.gz"
},
"1.11.0-rc1+0.aarch64.apple.darwin14": {
"UrlPath": "bin/mac/aarch64/1.11/julia-1.11.0-rc1-macaarch64.tar.gz"
},
"1.11.0-rc1+0.x64.apple.darwin14": {
"UrlPath": "bin/mac/x64/1.11/julia-1.11.0-rc1-mac64.tar.gz"
}
},
"AvailableChannels": {
Expand Down Expand Up @@ -591,7 +597,7 @@
"Version": "1.10.4+0.x64.apple.darwin14"
},
"1.11": {
"Version": "1.11.0-beta2+0.aarch64.apple.darwin14"
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"1.11.0-alpha1": {
"Version": "1.11.0-alpha1+0.aarch64.apple.darwin14"
Expand Down Expand Up @@ -629,11 +635,20 @@
"1.11.0-beta2~x64": {
"Version": "1.11.0-beta2+0.x64.apple.darwin14"
},
"1.11.0-rc1": {
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"1.11.0-rc1~aarch64": {
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"1.11.0-rc1~x64": {
"Version": "1.11.0-rc1+0.x64.apple.darwin14"
},
"1.11~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.apple.darwin14"
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"1.11~x64": {
"Version": "1.11.0-beta2+0.x64.apple.darwin14"
"Version": "1.11.0-rc1+0.x64.apple.darwin14"
},
"1.1~x64": {
"Version": "1.1.1+0.x64.apple.darwin14"
Expand Down Expand Up @@ -1146,22 +1161,22 @@
"Version": "1.10.4+0.x64.apple.darwin14"
},
"alpha": {
"Version": "1.11.0-beta2+0.aarch64.apple.darwin14"
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"alpha~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.apple.darwin14"
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"alpha~x64": {
"Version": "1.11.0-beta2+0.x64.apple.darwin14"
"Version": "1.11.0-rc1+0.x64.apple.darwin14"
},
"beta": {
"Version": "1.11.0-beta2+0.aarch64.apple.darwin14"
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"beta~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.apple.darwin14"
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"beta~x64": {
"Version": "1.11.0-beta2+0.x64.apple.darwin14"
"Version": "1.11.0-rc1+0.x64.apple.darwin14"
},
"lts": {
"Version": "1.6.7+0.x64.apple.darwin14"
Expand All @@ -1170,13 +1185,13 @@
"Version": "1.6.7+0.x64.apple.darwin14"
},
"rc": {
"Version": "1.10.4+0.aarch64.apple.darwin14"
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"rc~aarch64": {
"Version": "1.10.4+0.aarch64.apple.darwin14"
"Version": "1.11.0-rc1+0.aarch64.apple.darwin14"
},
"rc~x64": {
"Version": "1.10.4+0.x64.apple.darwin14"
"Version": "1.11.0-rc1+0.x64.apple.darwin14"
},
"release": {
"Version": "1.10.4+0.aarch64.apple.darwin14"
Expand All @@ -1188,5 +1203,5 @@
"Version": "1.10.4+0.x64.apple.darwin14"
}
},
"Version": "1.0.45"
"Version": "1.0.46"
}
27 changes: 18 additions & 9 deletions versiondb/versiondb-aarch64-unknown-linux-gnu.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,9 @@
},
"1.11.0-beta2+0.aarch64.linux.gnu": {
"UrlPath": "bin/linux/aarch64/1.11/julia-1.11.0-beta2-linux-aarch64.tar.gz"
},
"1.11.0-rc1+0.aarch64.linux.gnu": {
"UrlPath": "bin/linux/aarch64/1.11/julia-1.11.0-rc1-linux-aarch64.tar.gz"
}
},
"AvailableChannels": {
Expand Down Expand Up @@ -435,7 +438,7 @@
"Version": "1.10.4+0.aarch64.linux.gnu"
},
"1.11": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"1.11.0-alpha1": {
"Version": "1.11.0-alpha1+0.aarch64.linux.gnu"
Expand All @@ -461,8 +464,14 @@
"1.11.0-beta2~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
},
"1.11.0-rc1": {
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"1.11.0-rc1~aarch64": {
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"1.11~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"1.1~aarch64": {
"Version": "1.1.1+0.aarch64.linux.gnu"
Expand Down Expand Up @@ -963,16 +972,16 @@
"Version": "1.10.4+0.aarch64.linux.gnu"
},
"alpha": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"alpha~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"beta": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"beta~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"lts": {
"Version": "1.6.7+0.aarch64.linux.gnu"
Expand All @@ -981,10 +990,10 @@
"Version": "1.6.7+0.aarch64.linux.gnu"
},
"rc": {
"Version": "1.10.4+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"rc~aarch64": {
"Version": "1.10.4+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"release": {
"Version": "1.10.4+0.aarch64.linux.gnu"
Expand All @@ -993,5 +1002,5 @@
"Version": "1.10.4+0.aarch64.linux.gnu"
}
},
"Version": "1.0.45"
"Version": "1.0.46"
}
27 changes: 18 additions & 9 deletions versiondb/versiondb-aarch64-unknown-linux-musl.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,9 @@
},
"1.11.0-beta2+0.aarch64.linux.gnu": {
"UrlPath": "bin/linux/aarch64/1.11/julia-1.11.0-beta2-linux-aarch64.tar.gz"
},
"1.11.0-rc1+0.aarch64.linux.gnu": {
"UrlPath": "bin/linux/aarch64/1.11/julia-1.11.0-rc1-linux-aarch64.tar.gz"
}
},
"AvailableChannels": {
Expand Down Expand Up @@ -435,7 +438,7 @@
"Version": "1.10.4+0.aarch64.linux.gnu"
},
"1.11": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"1.11.0-alpha1": {
"Version": "1.11.0-alpha1+0.aarch64.linux.gnu"
Expand All @@ -461,8 +464,14 @@
"1.11.0-beta2~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
},
"1.11.0-rc1": {
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"1.11.0-rc1~aarch64": {
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"1.11~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"1.1~aarch64": {
"Version": "1.1.1+0.aarch64.linux.gnu"
Expand Down Expand Up @@ -963,16 +972,16 @@
"Version": "1.10.4+0.aarch64.linux.gnu"
},
"alpha": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"alpha~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"beta": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"beta~aarch64": {
"Version": "1.11.0-beta2+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"lts": {
"Version": "1.6.7+0.aarch64.linux.gnu"
Expand All @@ -981,10 +990,10 @@
"Version": "1.6.7+0.aarch64.linux.gnu"
},
"rc": {
"Version": "1.10.4+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"rc~aarch64": {
"Version": "1.10.4+0.aarch64.linux.gnu"
"Version": "1.11.0-rc1+0.aarch64.linux.gnu"
},
"release": {
"Version": "1.10.4+0.aarch64.linux.gnu"
Expand All @@ -993,5 +1002,5 @@
"Version": "1.10.4+0.aarch64.linux.gnu"
}
},
"Version": "1.0.45"
"Version": "1.0.46"
}
27 changes: 18 additions & 9 deletions versiondb/versiondb-i686-pc-windows-gnu.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,9 @@
},
"1.11.0-beta2+0.x86.w64.mingw32": {
"UrlPath": "bin/winnt/x86/1.11/julia-1.11.0-beta2-win32.tar.gz"
},
"1.11.0-rc1+0.x86.w64.mingw32": {
"UrlPath": "bin/winnt/x86/1.11/julia-1.11.0-rc1-win32.tar.gz"
}
},
"AvailableChannels": {
Expand Down Expand Up @@ -423,7 +426,7 @@
"Version": "1.10.4+0.x86.w64.mingw32"
},
"1.11": {
"Version": "1.11.0-beta2+0.x86.w64.mingw32"
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"1.11.0-alpha1": {
"Version": "1.11.0-alpha1+0.x86.w64.mingw32"
Expand All @@ -449,8 +452,14 @@
"1.11.0-beta2~x86": {
"Version": "1.11.0-beta2+0.x86.w64.mingw32"
},
"1.11.0-rc1": {
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"1.11.0-rc1~x86": {
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"1.11~x86": {
"Version": "1.11.0-beta2+0.x86.w64.mingw32"
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"1.1~x86": {
"Version": "1.1.1+0.x86.w64.mingw32"
Expand Down Expand Up @@ -885,16 +894,16 @@
"Version": "1.10.4+0.x86.w64.mingw32"
},
"alpha": {
"Version": "1.11.0-beta2+0.x86.w64.mingw32"
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"alpha~x86": {
"Version": "1.11.0-beta2+0.x86.w64.mingw32"
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"beta": {
"Version": "1.11.0-beta2+0.x86.w64.mingw32"
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"beta~x86": {
"Version": "1.11.0-beta2+0.x86.w64.mingw32"
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"lts": {
"Version": "1.6.7+0.x86.w64.mingw32"
Expand All @@ -903,10 +912,10 @@
"Version": "1.6.7+0.x86.w64.mingw32"
},
"rc": {
"Version": "1.10.4+0.x86.w64.mingw32"
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"rc~x86": {
"Version": "1.10.4+0.x86.w64.mingw32"
"Version": "1.11.0-rc1+0.x86.w64.mingw32"
},
"release": {
"Version": "1.10.4+0.x86.w64.mingw32"
Expand All @@ -915,5 +924,5 @@
"Version": "1.10.4+0.x86.w64.mingw32"
}
},
"Version": "1.0.45"
"Version": "1.0.46"
}
Loading

0 comments on commit dc7266a

Please sign in to comment.