From 584440bbe9c30912971c8e2f4a92e06f16ff8cb1 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Tue, 3 Mar 2026 11:49:34 +0100 Subject: [PATCH 1/2] build_all.d: Expand glob patterns for copyFile --- create_dmd_release/build_all.d | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/create_dmd_release/build_all.d b/create_dmd_release/build_all.d index af2f5655..c0fa3db5 100644 --- a/create_dmd_release/build_all.d +++ b/create_dmd_release/build_all.d @@ -139,7 +139,13 @@ struct Box if (src.startsWith("default:")) src = _tmpdir ~ "/" ~ src[8..$]; else if (src.startsWith("'default:")) - src = "'" ~ _tmpdir ~ "/" ~ src[9..$]; + { + // Expand 'default:path/*.ext' + src = _tmpdir ~ "/" ~ src[9..$-1]; + src = dirEntries(dirName(src), baseName(src), SpanMode.shallow) + .map!(f => f.name) + .join(" "); + } if (tgt.startsWith("default:")) tgt = _tmpdir ~ "/" ~ tgt[8..$]; From 40bc9ab20bae974653bb89ea534f30c75972d2d1 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Tue, 3 Mar 2026 12:34:38 +0100 Subject: [PATCH 2/2] build_release_template.yml: Chomp the prefixing 'v' from the release branch --- .github/workflows/build_release_template.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_release_template.yml b/.github/workflows/build_release_template.yml index f3195e59..ddefd219 100644 --- a/.github/workflows/build_release_template.yml +++ b/.github/workflows/build_release_template.yml @@ -248,14 +248,17 @@ jobs: 7z x inetc.zip -y -bb1 "-oc:\Program Files (x86)\NSIS" || exit /b :: unpack release .7z generated in previous step - 7z x create_dmd_release\build\dmd.${{ inputs.release_branch }}.windows.7z -odmd.windows || exit /b + :: chomp off the "v" prefix if there is one, as this is what build_all does + set release=${{ inputs.release_branch }} + if "%release:~0,1%"=="v" set release=%release:~1% + 7z x create_dmd_release\build\dmd.%release%.windows.7z -odmd.windows || exit /b @echo on "c:\Program Files (x86)\NSIS\makensis" /version for /f %%v in (dmd.windows\dmd2\src\VERSION) do set ver=%%v cd windows || exit /b "c:\Program Files (x86)\NSIS\makensis" /DVersion2=%ver% /DEmbedD2Dir=..\dmd.windows\dmd2 d2-installer.nsi || exit /b - ren dmd-%ver%.exe dmd-${{ inputs.release_branch }}.exe || exit /b + ren dmd-%ver%.exe dmd-%release%.exe || exit /b copy dmd-*.exe ..\create_dmd_release\build || exit /b #################################################################