From cb6d1b76dcb13e0c77102750ab5eb4f191b4fcba Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 2 Aug 2021 14:46:16 +0200 Subject: Remove pipeline_config.json File is replaced by pipeline_config.yaml. --- build_files/config/pipeline_config.json | 91 --------------------------------- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- source/tools | 2 +- 5 files changed, 4 insertions(+), 95 deletions(-) delete mode 100644 build_files/config/pipeline_config.json diff --git a/build_files/config/pipeline_config.json b/build_files/config/pipeline_config.json deleted file mode 100644 index 37048a23454..00000000000 --- a/build_files/config/pipeline_config.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "update-code": { - "git": { - "submodules": [ - { - "path": "release/scripts/addons", - "branch": "blender-v2.93-release", - "commit_id": "HEAD" - }, - { - "path": "release/scripts/addons_contrib", - "branch": "blender-v2.93-release", - "commit_id": "HEAD" - }, - { - "path": "release/datafiles/locale", - "branch": "blender-v2.93-release", - "commit_id": "HEAD" - }, - { - "path": "source/tools", - "branch": "blender-v2.93-release", - "commit_id": "HEAD" - } - ] - }, - "svn": { - "tests": { - "path": "lib/tests", - "branch": "tags/blender-2.93-release", - "commit_id": "HEAD" - }, - "libraries": { - "darwin-x86_64": { - "path": "lib/darwin", - "branch": "tags/blender-2.93-release", - "commit_id": "HEAD" - }, - "darwin-arm64": { - "path": "lib/darwin_arm64", - "branch": "tags/blender-2.93-release", - "commit_id": "HEAD" - }, - "linux-x86_64": { - "path": "lib/linux_centos7_x86_64", - "branch": "tags/blender-2.93-release", - "commit_id": "HEAD" - }, - "windows-amd64": { - "path": "lib/win64_vc15", - "branch": "tags/blender-2.93-release", - "commit_id": "HEAD" - } - } - } - }, - "buildbot": { - "gcc": { - "version": "9.0" - }, - "sdks": { - "optix": { - "version": "7.1.0" - }, - "cuda10": { - "version": "10.1" - }, - "cuda11": { - "version": "11.4" - } - }, - "cmake": { - "default": { - "version": "any", - "overrides": {} - }, - "darwin-x86_64": { - "overrides": {} - }, - "darwin-arm64": { - "overrides": {} - }, - "linux-x86_64": { - "overrides": {} - }, - "windows-amd64": { - "overrides": {} - } - } - } -} diff --git a/release/datafiles/locale b/release/datafiles/locale index 5ab29b1331d..e8bc1883fd4 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 5ab29b1331d2103dae634b987f121c4599459d7f +Subproject commit e8bc1883fd4de04ceb275a12736501bb37d1406a diff --git a/release/scripts/addons b/release/scripts/addons index 40112c2d372..7fd30539c69 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 40112c2d3720745b0d52b3225d9619e4dac3d126 +Subproject commit 7fd30539c69ce4aa3363e0d7c5e00ff4ca13886b diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 8970953d4a8..9468c406fb5 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 8970953d4a8a4ea3bf77c66370c817ed0cf1308a +Subproject commit 9468c406fb554e32ff47b62bfef356b3908ec651 diff --git a/source/tools b/source/tools index f99d29ae3e6..35dd27ded66 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit f99d29ae3e6ad44d45d79309454c45f8088781a4 +Subproject commit 35dd27ded664b1068e773c27988ee221f3ce39d9 -- cgit v1.2.3