Buildbot: Attempt to fix wrong branch in buildinfo
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 10 Apr 2019 13:46:47 +0000 (15:46 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 18 Apr 2019 09:52:34 +0000 (11:52 +0200)
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

index 595eacb..a339688 100644 (file)
@@ -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!')