Blender's benchmark submodule should be on the correct branch

This forces the release/scripts/benchmark submodule to be on the same
branch as the working directory of the bundle script (usually release-xxx).
This commit is contained in:
2018-08-17 11:50:40 +02:00
parent 363a7621ab
commit 8f0848dc35

View File

@@ -278,6 +278,13 @@ ${GIT_C} pull
echo "Updatying submodules to the latest version..."
${GIT_C} submodule update --remote --init --recursive
# The release/scripts/benchmark submodule should be on the correct branch (usually release-xxx)
BM_BRANCH=$(${GIT} -C ${SCRIPTPATH} rev-parse --abbrev-ref HEAD)
echo "Forcing release/scripts/benchmark to $BM_BRANCH branch..."
${GIT} -C ${SOURCE_DIRECTORY}/release/scripts/benchmark checkout ${BM_BRANCH}
if [ "${KERNEL_NAME}" == "Darwin" ]; then
# Get precompiled libs
cd "${SOURCE_DIRECTORY}"