Age | Commit message (Collapse) | Author |
|
|
|
The issue was rooting to the fact that the script was iterating into
every directory inside of blender.git/../lib/ and attempted to switch
them to the desired path. This doesn't work in an environment where
both master and release branch are built (or any environment where
non-needed SVN directories are not automatically removed).
This change makes it so script explicitly generates a list of
directories which are required for the build. For example, the script
now stores an exact folder with ABI such as win64_vc14.
Only those explicitly listed directories will be updated.
This allows to:
- Solve compilation failure of 2.81 branch after checkout for
win64_vc15 libraries has been created.
- Fail compilation if actually expected tag is missing (for example,
when trying to build release branch prior to libraries tag).
Now, there was a confusing logic about possible .svn folder in
lib_dirpath (effectively, blender.git/../lib/.svn) which is not
something what is supposed to happen with the setup of buildbot we are
using for quite some time now. This logic has been removed now.
This change includes old-style string format(), mainly because it is
not know that the buidlbot scripts are run using python3 on CentOS
builder.
Differential Revision: https://developer.blender.org/D6230
|
|
|
|
|
|
|
|
|
|
The submodules don't have remote branches configured, skip that test since
we assume pulling from the "origin" remote anyway.
|
|
Checking out release branches in submodules, and printing some more
informative messages when that fails.
|
|
|
|
Just skip convenience test that checks if a rebase/merge is in progress.
|
|
And fall back to python3 from our libraries for other commands, once checked
out with make update.
|
|
This prints a more informative message, and is convenient when working with
local changes or in a branch where you only need to update submodules or tests.
|
|
These will not stop the build on failure yet, first step is to get them passing
more reliably.
|
|
|
|
Specifically on Linux, when not having a tests checkout.
|
|
Needed for buildbot, but interactively solving svn conflicts in the middle
of manual make update is also not ideal.
|
|
|
|
|
|
|
|
|
|
Differential Revision: https://developer.blender.org/D5545
|