Merge remote-tracking branch 'upstream/master' into stable

This commit is contained in:
Iain Buclaw 2023-01-01 07:18:28 +00:00
commit 3e46fadc8b
2 changed files with 8 additions and 8 deletions

View file

@ -16,17 +16,17 @@ build_script:
{ {
$version = $env:DVersion; $version = $env:DVersion;
if($version -eq "stable") { if($version -eq "stable") {
$latest = (Invoke-WebRequest "http://downloads.dlang.org/releases/LATEST").toString(); $latest = (Invoke-WebRequest "https://downloads.dlang.org/releases/LATEST").toString();
$url = "http://downloads.dlang.org/releases/2.x/$($latest)/dmd.$($latest).windows.7z"; $url = "https://downloads.dlang.org/releases/2.x/$($latest)/dmd.$($latest).windows.7z";
}elseif($version -eq "beta") { }elseif($version -eq "beta") {
$latest = (Invoke-WebRequest "http://downloads.dlang.org/pre-releases/LATEST").toString(); $latest = (Invoke-WebRequest "https://downloads.dlang.org/pre-releases/LATEST").toString();
$latestVersion = $latest.split("-")[0].split("~")[0]; $latestVersion = $latest.split("-")[0].split("~")[0];
$url = "http://downloads.dlang.org/pre-releases/2.x/$($latestVersion)/dmd.$($latest).windows.7z"; $url = "https://downloads.dlang.org/pre-releases/2.x/$($latestVersion)/dmd.$($latest).windows.7z";
}elseif($version -eq "nightly") { }elseif($version -eq "nightly") {
$latest = (Invoke-WebRequest "http://downloads.dlang.org/nightlies/dmd-master/LATEST").toString().replace("`n","").replace("`r",""); $latest = (Invoke-WebRequest "https://downloads.dlang.org/nightlies/dmd-master/LATEST").toString().replace("`n","").replace("`r","");
$url = "http://downloads.dlang.org/nightlies/dmd-$($latest)/dmd.master.windows.7z" $url = "https://downloads.dlang.org/nightlies/dmd-$($latest)/dmd.master.windows.7z"
}else { }else {
$url = "http://downloads.dlang.org/releases/2.x/$($version)/dmd.$($version).windows.7z"; $url = "https://downloads.dlang.org/releases/2.x/$($version)/dmd.$($version).windows.7z";
} }
$env:PATH += ";C:\dmd2\windows\bin;"; $env:PATH += ";C:\dmd2\windows\bin;";
return $url; return $url;

2
dget.d
View file

@ -110,7 +110,7 @@ ubyte[] download(string url)
auto http = HTTP(url); auto http = HTTP(url);
http.method = HTTP.Method.get; http.method = HTTP.Method.get;
http.onReceiveHeader((k, v) http.onReceiveHeader((in k, in v)
{ {
if (k == "content-length") if (k == "content-length")
contentLength = to!size_t(v); contentLength = to!size_t(v);