Skip to content

Commit 1a7db7b

Browse files
authored
Fix issue 24239 - dlang.org tests on CircleCI run out of memory (#3724)
Manually set the number of jobs used by build.d on CircleCI, because the automatically calculated number of CPU cores is too high. This depends on dlang/dmd#15799.
1 parent 482d36f commit 1a7db7b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.circleci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ run_make()
109109
make -v
110110
111111
# -j1 is used for a better error log
112-
make -f posix.mak -j1 DIFFABLE=1 release
112+
make -f posix.mak -j1 DIFFABLE=1 BUILD_JOBS=3 release
113113
}
114114
115115
case $1 in

posix.mak

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -594,20 +594,20 @@ ${DMD_DIR}/VERSION : ${DMD_DIR}
594594
################################################################################
595595

596596
$(DMD) : ${DMD_DIR}
597-
${MAKE} --directory=${DMD_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1
597+
${MAKE} --directory=${DMD_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1 BUILD_JOBS=$(BUILD_JOBS)
598598

599599
$(DMD_LATEST) : ${DMD_LATEST_DIR}
600-
${MAKE} --directory=${DMD_LATEST_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1
600+
${MAKE} --directory=${DMD_LATEST_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1 BUILD_JOBS=$(BUILD_JOBS)
601601
sed -i -e "s|../druntime/import |../../dmd-${LATEST}/druntime/import |" -e "s|../phobos |../phobos-${LATEST} |" $@.conf
602602

603603
dmd-prerelease : $(STD_DDOC_PRERELEASE) druntime-target $G/changelog/next-version
604-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML)
604+
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML) BUILD_JOBS=$(BUILD_JOBS)
605605

606606
dmd-release : $(STD_DDOC_RELEASE) druntime-target
607-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML)
607+
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML) BUILD_JOBS=$(BUILD_JOBS)
608608

609609
dmd-latest : $(STD_DDOC_LATEST) druntime-latest-target
610-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML)
610+
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML) BUILD_JOBS=$(BUILD_JOBS)
611611

612612
dmd-prerelease-verbatim : $W/phobos-prerelease/mars.verbatim
613613
$W/phobos-prerelease/mars.verbatim: $(STD_DDOC_PRERELEASE) druntime-target \

0 commit comments

Comments
 (0)