From c9df453ce70bdf36a4567f8a97b977c1f5e6dfd7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 20 Dec 2018 14:45:55 +0100 Subject: Update for moving blender2.8 to master. --- build_files/buildbot/slave_pack.py | 8 ++++---- build_files/windows/update_sources.cmd | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'build_files') diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 22cf386c77a..2eaf9c23601 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -107,8 +107,8 @@ if builder.find('cmake') != -1: if builder.endswith('vc2015'): platform += "-vc14" builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform) - # NOTE: Blender 2.8 is already respected by blender_full_version. - if branch != '' and branch != 'blender2.8': + # NOTE: Blender 2.7 is already respected by blender_full_version. + if branch != '' and branch != 'blender2.7': builderified_name = branch + "-" + builderified_name os.rename(result_file, "{}.zip".format(builderified_name)) @@ -173,8 +173,8 @@ if builder.find('cmake') != -1: blender_hash, blender_glibc, blender_arch) - # NOTE: Blender 2.8 is already respected by blender_full_version. - if branch != '' and branch != 'blender2.8': + # NOTE: Blender 2.7 is already respected by blender_full_version. + if branch != '' and branch != 'blender2.7': package_name = branch + "-" + package_name upload_filename = package_name + ".tar.bz2" diff --git a/build_files/windows/update_sources.cmd b/build_files/windows/update_sources.cmd index be5303ad1b5..3906af27cb9 100644 --- a/build_files/windows/update_sources.cmd +++ b/build_files/windows/update_sources.cmd @@ -11,10 +11,6 @@ if "%GIT%" == "" ( goto EOF ) "%GIT%" pull --rebase -"%GIT%" submodule update --init --recursive -rem Use blender2.8 branch for submodules that have it. -"%GIT%" submodule foreach "git checkout blender2.8 || git checkout master" -"%GIT%" submodule foreach git pull --rebase origin +"%GIT%" submodule foreach git pull --rebase origin master - -:EOF \ No newline at end of file +:EOF -- cgit v1.2.3