wip: sync latest changes

SlateFoundation · Oct 16, 2019 · c65bb9c · c65bb9c
1 parent b7d6fb3
commit c65bb9c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/.holo/branches/emergence-site/_skeleton-v2.toml b/.holo/branches/emergence-site/_skeleton-v2.toml
@@ -0,0 +1,5 @@
+[holomapping]
+files = [
+    "*/**",
+    "!php-config/Git.config.d/"
+]
diff --git a/.holo/branches/emergence-site/_slate-cbl-baxter.toml b/.holo/branches/emergence-site/_slate-cbl-baxter.toml
@@ -1,3 +1,5 @@
 [holomapping]
-files = "*/**"
-after = "*"
+files = [
+    "*/**"
+]
+after = [ "slate-cbl" ]
diff --git a/.holo/branches/emergence-site/_slate-cbl.toml b/.holo/branches/emergence-site/_slate-cbl.toml
@@ -1,6 +1,14 @@
 [holomapping]
 files = [
     "**",
-    "!php-config/Git.config.d/"
+    "!php-config/Git.config.d/",
+    # exclude the submodules we're using temporarily to support local dev
+    # -- they would overwrite the trees coming in the right way through projection
+
+    "!sencha-workspace/ext",
+    "!sencha-workspace/packages.remote/",
+    "!sencha-workspace/.sencha/",
+    "!sencha-workspace/workspace.json",
+    "sencha-workspace/plan.abstract.sh"
 ]
-before = "*"
+after = [ "skeleton-v2" ]
diff --git a/.holo/branches/emergence-skeleton.toml b/.holo/branches/emergence-skeleton.toml
@@ -0,0 +1,3 @@
+[holobranch]
+extend = "emergence-site"
+lens = false
diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml
@@ -0,0 +1,6 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
+ref = "refs/heads/releases/v2"
+
+[holosource.project]
+holobranch = "emergence-skeleton"