[Bf-blender-cvs] [d870b85dabf] xr-controller-support: Update pipeline config
Peter Kim
noreply at git.blender.org
Sat Aug 7 13:48:12 CEST 2021
Commit: d870b85dabf53e9213f4906b38ee3067ce86f6c2
Author: Peter Kim
Date: Sat Aug 7 20:46:41 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rBd870b85dabf53e9213f4906b38ee3067ce86f6c2
Update pipeline config
===================================================================
D build_files/config/pipeline_config.json
M build_files/config/pipeline_config.yaml
===================================================================
diff --git a/build_files/config/pipeline_config.json b/build_files/config/pipeline_config.json
deleted file mode 100644
index 62a734b3728..00000000000
--- a/build_files/config/pipeline_config.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- "update-code":
- {
- "git" :
- {
- "submodules":
- [
- { "path": "release/scripts/addons", "branch": "xr-controller-support", "commit_id": "HEAD" },
- { "path": "release/scripts/addons_contrib", "branch": "master", "commit_id": "HEAD" },
- { "path": "release/datafiles/locale", "branch": "master", "commit_id": "HEAD" },
- { "path": "source/tools", "branch": "master", "commit_id": "HEAD" }
- ]
- },
- "svn":
- {
- "tests": { "path": "lib/tests", "branch": "trunk", "commit_id": "HEAD" },
- "libraries":
- {
- "darwin-x86_64": { "path": "lib/darwin", "branch": "trunk", "commit_id": "HEAD" },
- "darwin-arm64": { "path": "lib/darwin_arm64", "branch": "trunk", "commit_id": "HEAD" },
- "linux-x86_64": { "path": "lib/linux_centos7_x86_64", "branch": "trunk", "commit_id": "HEAD" },
- "windows-amd64": { "path": "lib/win64_vc15", "branch": "trunk", "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/build_files/config/pipeline_config.yaml b/build_files/config/pipeline_config.yaml
index 611df59caec..cc5b4be0a11 100644
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -8,7 +8,7 @@ update-code:
- branch: master
commit_id: HEAD
path: release/scripts/addons
- - branch: master
+ - branch: xr-controller-support
commit_id: HEAD
path: release/scripts/addons_contrib
- branch: master
More information about the Bf-blender-cvs
mailing list