Skip to content

Commit 898cbe9

Browse files
committed
use cacheable zip snapshot instead of cloning mingw
- had some reliability issues with sourceforge's git mirror
1 parent fed5e7e commit 898cbe9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

create_dmd_release/build_all.d

+6-3
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,8 @@ int main(string[] args)
460460
enum libC = "snn.lib";
461461
enum libCurl = "libcurl-7.52.1-WinSSL-zlib-x86-x64.zip";
462462
enum omflibs = "omflibs-winsdk-10.0.16299.15.zip";
463+
// 5.0-active branch
464+
enum mingw_wsl = "mingw-mingw-org-wsl-a771e066eaf830a3a94a21968939748e8af776d2.zip";
463465

464466
auto oldCompilers = platforms
465467
.map!(p => "dmd.%1$s.%2$s.%3$s".format(oldVer, p, p.os == OS.windows ? "7z" : "tar.xz"));
@@ -470,6 +472,7 @@ int main(string[] args)
470472
fetchFile("http://ftp.digitalmars.com/"~libC, cacheDir~"/"~libC);
471473
fetchFile("http://downloads.dlang.org/other/"~libCurl, cacheDir~"/"~libCurl, true);
472474
fetchFile("http://downloads.dlang.org/other/"~omflibs, cacheDir~"/"~omflibs, true);
475+
fetchFile("https://sourceforge.net/code-snapshots/git/m/mi/mingw/mingw-org-wsl.git/"~mingw_wsl, cacheDir~"/"~mingw_wsl);
473476

474477
// Unpack previous dmd release
475478
foreach (platform, oldCompiler; platforms.zip(oldCompilers))
@@ -487,9 +490,9 @@ int main(string[] args)
487490
extract(cacheDir~"/"~libCurl, workDir~"/windows/old-dmd/");
488491
// Get updated OMF import libraries
489492
extract(cacheDir~"/"~omflibs, workDir~"/windows/old-dmd/dmd2/windows/lib/");
490-
491-
// grab mingw sources
492-
run("git clone --depth 1 --branch 5.0-active https://git.code.sf.net/p/mingw/mingw-org-wsl.git " ~ workDir ~ "/clones/mingw");
493+
// Get mingw sources
494+
extract(cacheDir~"/"~mingw_wsl, workDir~"/clones");
495+
run("mv %s %s".format(workDir~"/clones/"~mingw_wsl.stripExtension, workDir~"/clones/mingw"));
493496
}
494497

495498
cloneSources(gitTag, dubTag, isBranch, skipDocs, workDir~"/clones");

0 commit comments

Comments
 (0)