Skip to content

Commit e8aae00

Browse files
committed
Use --relocate-xdg-cache-home-under-build-subdir for some Linux presets
This should reduce the frequency of module errors due to shared module caches between runs on the same Linux bot. The list of presets affected should be ``` buildbot_incremental_linux buildbot_incremental_linux,asan buildbot_incremental_linux,llvm-only buildbot_incremental_linux,long_test buildbot_incremental_linux,tsan-libdispatch-test buildbot_incremental_linux_1404 buildbot_incremental_linux_1404,long_test buildbot_incremental_linux_base buildbot_linux buildbot_linux,foundation=debug buildbot_linux,foundation=release buildbot_linux,no_test buildbot_linux,smoketest buildbot_linux_1404_no_lldb buildbot_linux_1510 buildbot_linux_1510,notest buildbot_linux_1604 buildbot_linux_1604,notest buildbot_linux_1610 buildbot_linux_1610,notest buildbot_linux_1804 buildbot_linux_1804,notest mixin_linux_installation ``` Addresses rdar://73932610, rdar://73933230 (cherry picked from commit 693e487)
1 parent 86b97f7 commit e8aae00

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

utils/build-presets.ini

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,13 @@ install-destdir=%(install_destdir)s
804804
# Path to the .tar.gz package we would create.
805805
installable-package=%(installable_package)s
806806

807+
# This ensures the default module cache
808+
# location is local to this run, allowing
809+
# to schedule multiple builds safely
810+
# in Linux CI bots
811+
relocate-xdg-cache-home-under-build-subdir
812+
813+
807814
[preset: buildbot_linux]
808815
mixin-preset=mixin_linux_installation
809816
build-subdir=buildbot_linux
@@ -1036,6 +1043,13 @@ lit-args=-v
10361043
build-ninja
10371044
reconfigure
10381045

1046+
# This ensures the default module cache
1047+
# location is local to this run, allowing
1048+
# to schedule multiple builds safely
1049+
# in Linux CI bots
1050+
relocate-xdg-cache-home-under-build-subdir
1051+
1052+
10391053
[preset: buildbot_incremental_linux]
10401054
mixin-preset=
10411055
buildbot_incremental_linux_base

0 commit comments

Comments
 (0)