From 622fef0c407c36d6a767dab4aa4d0ac086dbb140 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Fri, 28 Feb 2025 13:34:33 +0100 Subject: [PATCH 1/2] premerge-monolithic-* --- buildbot/osuosl/master/config/builders.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py index cc70ea9b..d61a9203 100644 --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -3352,7 +3352,7 @@ 'builddir': "premerge-monolithic-windows", 'factory' : UnifiedTreeBuilder.getCmakeWithNinjaWithMSVCBuildFactory( vs="autodetect", - depends_on_projects=["clang-tools-extra", "clang", "flang", "libclc", "lld", "llvm", "mlir", "polly", "pstl"], + depends_on_projects=["clang-tools-extra", "clang", "flang", "flang-rt", "libclc", "lld", "llvm", "mlir", "polly", "pstl"], checks=["check-all"], install_pip_requirements = True, extra_configure_args=[ @@ -3372,7 +3372,7 @@ 'workernames': ["premerge-linux-1"], 'builddir': "premerge-monolithic-linux", 'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory( - depends_on_projects=["bolt", "clang", "clang-tools-extra", "compiler-rt", "flang", "libc", "libclc", "lld", "llvm", "mlir", "polly", "pstl"], + depends_on_projects=["bolt", "clang", "clang-tools-extra", "compiler-rt", "flang", "flang-rt", "libc", "libclc", "lld", "llvm", "mlir", "polly", "pstl"], install_pip_requirements = True, extra_configure_args=[ "-DCMAKE_BUILD_TYPE=Release", From d31a5e32e43a1b49af63ca5c199d55bafbe2c044 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Mon, 3 Mar 2025 09:42:28 +0100 Subject: [PATCH 2/2] flang switched off in premerge buildbot --- buildbot/osuosl/master/config/builders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py index d61a9203..3cad1bd7 100644 --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -3352,7 +3352,7 @@ 'builddir': "premerge-monolithic-windows", 'factory' : UnifiedTreeBuilder.getCmakeWithNinjaWithMSVCBuildFactory( vs="autodetect", - depends_on_projects=["clang-tools-extra", "clang", "flang", "flang-rt", "libclc", "lld", "llvm", "mlir", "polly", "pstl"], + depends_on_projects=["clang-tools-extra", "clang", "libclc", "lld", "llvm", "mlir", "polly", "pstl"], checks=["check-all"], install_pip_requirements = True, extra_configure_args=[