Skip to content

Commit 9428a5d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents ff722ae + 50a59aa commit 9428a5d

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/build_release_template.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
include:
127127
- os: ubuntu-20.04
128128
target: linux
129-
- os: macos-12
129+
- os: macos-13
130130
target: osx
131131
- os: windows-2019
132132
target: windows
@@ -252,6 +252,7 @@ jobs:
252252
for /f %%v in (dmd.windows\dmd2\src\VERSION) do set ver=%%v
253253
cd windows || exit /b
254254
"c:\Program Files (x86)\NSIS\makensis" /DVersion2=%ver% /DEmbedD2Dir=..\dmd.windows\dmd2 d2-installer.nsi || exit /b
255+
ren dmd-%ver%.exe dmd-${{ inputs.release_branch }}.exe || exit /b
255256
copy dmd-*.exe ..\create_dmd_release\build || exit /b
256257
257258
#################################################################

create_dmd_release/create_dmd_release.d

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,19 @@ void buildAll(Bits bits, string branch)
340340
const jobs = " -j4";
341341
const dmdEnv = ` "DMD=`~cloneDir~`/dmd/generated/`~osDirName~`/release/`~bitsStr~`/dmd`~exe~`"`;
342342
const isRelease = " ENABLE_RELEASE=1";
343-
//Enable lto for everything except FreeBSD - the generated dmd segfaults immediatly.
343+
344+
// Enable lto for everything except FreeBSD - the generated dmd segfaults immediatly.
345+
// OSX is disabled "temporarily" due to https://github.com/dlang/installer/actions/runs/12156929210/job/33901843249?pr=588#step:6:660
346+
// wherein OSX with LTO timeTraceProfiler a TLS variable gets put into LTO layout which asserts out in ldc.
344347
version (FreeBSD)
345348
const ltoOption = " ENABLE_LTO=0";
346349
else version (linux)
347350
const ltoOption = " ENABLE_LTO=" ~ (is32 ? "0" : "1");
351+
else version(OSX)
352+
const ltoOption = " ENABLE_LTO=0";
348353
else
349354
const ltoOption = " ENABLE_LTO=1";
355+
350356
const latest = " LATEST="~branch;
351357
// PIC libraries on amd64 for PIE-by-default distributions, see Bugzilla 16794
352358
version (linux)

0 commit comments

Comments
 (0)