diff options
author | Thomas Dinges <blender@dingto.org> | 2022-07-27 18:31:49 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2022-07-27 18:31:49 +0300 |
commit | 3b71a62390aed9079c5c245b826436e49fa91623 (patch) | |
tree | 62eaff8e96999048a91b51947a70dbe662167646 /build_files | |
parent | 9015952c9c0075b46d20204328ac17ee96e54881 (diff) | |
parent | d61ab45385eba116dbfcbf6c5ccfb997be7e324f (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/build_environment/cmake/download.cmake | 2 | ||||
-rw-r--r-- | build_files/config/pipeline_config.yaml | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index 547bf77f8dd..76744aa9b0c 100644 --- a/build_files/build_environment/cmake/download.cmake +++ b/build_files/build_environment/cmake/download.cmake @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later ## Update and uncomment this in the release branch -# set(BLENDER_VERSION 3.1) +set(BLENDER_VERSION 3.3) function(download_source dep) set(TARGET_FILE ${${dep}_FILE}) diff --git a/build_files/config/pipeline_config.yaml b/build_files/config/pipeline_config.yaml index 82cd009ea95..aedaf35629b 100644 --- a/build_files/config/pipeline_config.yaml +++ b/build_files/config/pipeline_config.yaml @@ -5,38 +5,38 @@ update-code: git: submodules: - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/scripts/addons - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/scripts/addons_contrib - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/datafiles/locale - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: source/tools svn: libraries: darwin-arm64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/darwin_arm64 darwin-x86_64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/darwin linux-x86_64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/linux_centos7_x86_64 windows-amd64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/win64_vc15 tests: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/tests benchmarks: |