Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-04-10 16:46:47 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-04-18 12:52:34 +0300
commitcc9528d3c8e71372528471e8071f494cdec067ee (patch)
tree3b44da374297f8b7c821ddec7728280db219d859
parent10f724cec5e3e80eb2e790a18aaa54861661adde (diff)
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.
-rw-r--r--build_files/buildbot/slave_compile.py6
1 files changed, 6 insertions, 0 deletions
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!')