From cc9528d3c8e71372528471e8071f494cdec067ee Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 10 Apr 2019 15:46:47 +0200 Subject: Buildbot: Attempt to fix wrong branch in buildinfo For some reason the buildinfo header was not re-generated. The root reason is not really clear to me, so simply remove the header similar to the CMake cache. --- build_files/buildbot/slave_compile.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 595eacbda80..a339688c06a 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -154,6 +154,12 @@ if 'cmake' in builder: if os.path.exists('CMakeCache.txt'): print("Removing CMake cache") os.remove('CMakeCache.txt') + # Remove buildinfo files to force buildbot to re-generate them. + for buildinfo in ('buildinfo.h', 'buildinfo.h.txt', ): + full_path = os.path.join('source', 'creator', buildinfo) + if os.path.exists(full_path): + print("Removing {}" . format(buildinfo)) + os.remove(full_path) retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options) if retcode != 0: print('Configuration FAILED!') -- cgit v1.2.3