[Bf-blender-cvs] [256ab174d83] blender-v2.93-release: Added pipeline config formatted in yaml.

Jeroen Bakker noreply at git.blender.org
Mon Jul 26 15:01:10 CEST 2021


Commit: 256ab174d834fa6f322e53a1d6c8869dbae914a0
Author: Jeroen Bakker
Date:   Mon Jul 26 14:57:21 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB256ab174d834fa6f322e53a1d6c8869dbae914a0

Added pipeline config formatted in yaml.

===================================================================

A	build_files/config/pipeline_config.yaml
M	release/datafiles/locale
M	release/scripts/addons

===================================================================

diff --git a/build_files/config/pipeline_config.yaml b/build_files/config/pipeline_config.yaml
new file mode 100644
index 00000000000..13228b4eb5b
--- /dev/null
+++ b/build_files/config/pipeline_config.yaml
@@ -0,0 +1,69 @@
+#
+# Do NOT merge to master 
+#
+
+#
+# Used by Buildbot build pipeline make_update.py script only for now
+# We intended to udpate the make_update.py in the branches to use this file eventually
+#
+update-code:
+    git:
+        submodules:
+        -   branch: blender-v2.93-release
+            commit_id: HEAD
+            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
+    svn:
+        libraries:
+            darwin-arm64:
+                branch: tags/blender-2.93-release
+                commit_id: HEAD
+                path: lib/darwin_arm64
+            darwin-x86_64:
+                branch: tags/blender-2.93-release
+                commit_id: HEAD
+                path: lib/darwin
+            linux-x86_64:
+                branch: tags/blender-2.93-release
+                commit_id: HEAD
+                path: lib/linux_centos7_x86_64
+            windows-amd64:
+                branch: tags/blender-2.93-release
+                commit_id: HEAD
+                path: lib/win64_vc15
+        tests:
+            branch: tags/blender-2.93-release
+            commit_id: HEAD
+            path: lib/tests
+#
+# Buildbot only configs
+#
+buildbot:
+    gcc:
+        version: '9.0.0'
+    cuda10:
+        version: '10.1.0'
+    cuda11:
+        version: '11.4.0'
+    optix:
+        version: '7.1.0'
+    cmake:
+        default:
+            overrides: {}
+            version: any
+        darwin-arm64:
+            overrides: {}
+        darwin-x86_64:
+            overrides: {}
+        linux-x86_64:
+            overrides: {}
+        windows-amd64:
+            overrides: {}
diff --git a/release/datafiles/locale b/release/datafiles/locale
index f7b706dd643..5ab29b1331d 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit f7b706dd6434db2d752f47c4b8c3148b2990fd73
+Subproject commit 5ab29b1331d2103dae634b987f121c4599459d7f
diff --git a/release/scripts/addons b/release/scripts/addons
index af635613961..40112c2d372 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit af6356139616749c952ff5dfc6bf6dfa668e3325
+Subproject commit 40112c2d3720745b0d52b3225d9619e4dac3d126



More information about the Bf-blender-cvs mailing list