Skip to content

Commit 40bc9ab

Browse files
committed
build_release_template.yml: Chomp the prefixing 'v' from the release branch
1 parent 584440b commit 40bc9ab

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/build_release_template.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,17 @@ jobs:
248248
7z x inetc.zip -y -bb1 "-oc:\Program Files (x86)\NSIS" || exit /b
249249
250250
:: unpack release .7z generated in previous step
251-
7z x create_dmd_release\build\dmd.${{ inputs.release_branch }}.windows.7z -odmd.windows || exit /b
251+
:: chomp off the "v" prefix if there is one, as this is what build_all does
252+
set release=${{ inputs.release_branch }}
253+
if "%release:~0,1%"=="v" set release=%release:~1%
254+
7z x create_dmd_release\build\dmd.%release%.windows.7z -odmd.windows || exit /b
252255
253256
@echo on
254257
"c:\Program Files (x86)\NSIS\makensis" /version
255258
for /f %%v in (dmd.windows\dmd2\src\VERSION) do set ver=%%v
256259
cd windows || exit /b
257260
"c:\Program Files (x86)\NSIS\makensis" /DVersion2=%ver% /DEmbedD2Dir=..\dmd.windows\dmd2 d2-installer.nsi || exit /b
258-
ren dmd-%ver%.exe dmd-${{ inputs.release_branch }}.exe || exit /b
261+
ren dmd-%ver%.exe dmd-%release%.exe || exit /b
259262
copy dmd-*.exe ..\create_dmd_release\build || exit /b
260263
261264
#################################################################

0 commit comments

Comments
 (0)