diff --git a/.holo/branches/emergence-layer/_emergence-github.toml b/.holo/branches/emergence-layer/_emergence-github.toml deleted file mode 100644 index 70e025cf..00000000 --- a/.holo/branches/emergence-layer/_emergence-github.toml +++ /dev/null @@ -1,6 +0,0 @@ -[holomapping] -files = [ - "*/**", - "!php-config/Git.config.d/" -] -before = "laddr" diff --git a/.holo/branches/emergence-layer/_emergence-redirects.toml b/.holo/branches/emergence-layer/_emergence-redirects.toml deleted file mode 100644 index 70e025cf..00000000 --- a/.holo/branches/emergence-layer/_emergence-redirects.toml +++ /dev/null @@ -1,6 +0,0 @@ -[holomapping] -files = [ - "*/**", - "!php-config/Git.config.d/" -] -before = "laddr" diff --git a/.holo/branches/emergence-layer/_emergence-saml2.toml b/.holo/branches/emergence-layer/_emergence-saml2.toml deleted file mode 100644 index 70e025cf..00000000 --- a/.holo/branches/emergence-layer/_emergence-saml2.toml +++ /dev/null @@ -1,6 +0,0 @@ -[holomapping] -files = [ - "*/**", - "!php-config/Git.config.d/" -] -before = "laddr" diff --git a/.holo/branches/emergence-layer/_emergence-slack.toml b/.holo/branches/emergence-layer/_emergence-slack.toml deleted file mode 100644 index 70e025cf..00000000 --- a/.holo/branches/emergence-layer/_emergence-slack.toml +++ /dev/null @@ -1,6 +0,0 @@ -[holomapping] -files = [ - "*/**", - "!php-config/Git.config.d/" -] -before = "laddr" diff --git a/.holo/branches/emergence-layer/_laddr.toml b/.holo/branches/emergence-layer/_laddr.toml deleted file mode 100644 index 78e5207f..00000000 --- a/.holo/branches/emergence-layer/_laddr.toml +++ /dev/null @@ -1,6 +0,0 @@ -[holomapping] -files = [ - "*/**", - "!.vscode/", - "!docs/" -] \ No newline at end of file diff --git a/.holo/branches/emergence-layer/site-root/css/lib/_bootstrap-combobox.toml b/.holo/branches/emergence-layer/site-root/css/lib/_bootstrap-combobox.toml deleted file mode 100644 index 7da7b505..00000000 --- a/.holo/branches/emergence-layer/site-root/css/lib/_bootstrap-combobox.toml +++ /dev/null @@ -1,5 +0,0 @@ -[holomapping] -root = "css" -files = [ - "bootstrap-combobox.css" -] \ No newline at end of file diff --git a/.holo/branches/emergence-layer/site-root/css/lib/_select2.toml b/.holo/branches/emergence-layer/site-root/css/lib/_select2.toml deleted file mode 100644 index f1880cb6..00000000 --- a/.holo/branches/emergence-layer/site-root/css/lib/_select2.toml +++ /dev/null @@ -1,5 +0,0 @@ -[holomapping] -root = "dist/css" -files = [ - "select2.css" -] diff --git a/.holo/branches/emergence-layer/site-root/js/lib/_bootstrap-combobox.toml b/.holo/branches/emergence-layer/site-root/js/lib/_bootstrap-combobox.toml deleted file mode 100644 index ba07fd5d..00000000 --- a/.holo/branches/emergence-layer/site-root/js/lib/_bootstrap-combobox.toml +++ /dev/null @@ -1,5 +0,0 @@ -[holomapping] -root = "js" -files = [ - "bootstrap-combobox.js" -] \ No newline at end of file diff --git a/.holo/branches/emergence-layer/site-root/js/lib/_select2.toml b/.holo/branches/emergence-layer/site-root/js/lib/_select2.toml deleted file mode 100644 index aa32df79..00000000 --- a/.holo/branches/emergence-layer/site-root/js/lib/_select2.toml +++ /dev/null @@ -1,5 +0,0 @@ -[holomapping] -root = "dist/js" -files = [ - "select2.js" -] diff --git a/.holo/branches/emergence-site/_emergence-github.toml b/.holo/branches/emergence-site/_emergence-github.toml index 53c20091..70e025cf 100644 --- a/.holo/branches/emergence-site/_emergence-github.toml +++ b/.holo/branches/emergence-site/_emergence-github.toml @@ -3,5 +3,4 @@ files = [ "*/**", "!php-config/Git.config.d/" ] -after = "skeleton-v2" before = "laddr" diff --git a/.holo/branches/emergence-site/_emergence-redirects.toml b/.holo/branches/emergence-site/_emergence-redirects.toml index 53c20091..70e025cf 100644 --- a/.holo/branches/emergence-site/_emergence-redirects.toml +++ b/.holo/branches/emergence-site/_emergence-redirects.toml @@ -3,5 +3,4 @@ files = [ "*/**", "!php-config/Git.config.d/" ] -after = "skeleton-v2" before = "laddr" diff --git a/.holo/branches/emergence-site/_emergence-saml2.toml b/.holo/branches/emergence-site/_emergence-saml2.toml index 53c20091..70e025cf 100644 --- a/.holo/branches/emergence-site/_emergence-saml2.toml +++ b/.holo/branches/emergence-site/_emergence-saml2.toml @@ -3,5 +3,4 @@ files = [ "*/**", "!php-config/Git.config.d/" ] -after = "skeleton-v2" before = "laddr" diff --git a/.holo/branches/emergence-site/_emergence-slack.toml b/.holo/branches/emergence-site/_emergence-slack.toml index 53c20091..70e025cf 100644 --- a/.holo/branches/emergence-site/_emergence-slack.toml +++ b/.holo/branches/emergence-site/_emergence-slack.toml @@ -3,5 +3,4 @@ files = [ "*/**", "!php-config/Git.config.d/" ] -after = "skeleton-v2" before = "laddr" diff --git a/.holo/branches/emergence-site/_laddr.toml b/.holo/branches/emergence-site/_laddr.toml index 0a1f04e8..c9e7976a 100644 --- a/.holo/branches/emergence-site/_laddr.toml +++ b/.holo/branches/emergence-site/_laddr.toml @@ -4,4 +4,4 @@ files = [ "!.vscode/", "!docs/" ] -after = "skeleton-v2" +after = "*" diff --git a/.holo/branches/emergence-site/_skeleton-v2.toml b/.holo/branches/emergence-site/_skeleton-v2.toml index d19835d7..828b8a0c 100644 --- a/.holo/branches/emergence-site/_skeleton-v2.toml +++ b/.holo/branches/emergence-site/_skeleton-v2.toml @@ -3,3 +3,4 @@ files = [ "*/**", "!php-config/Git.config.d/" ] +before = "*" diff --git a/.holo/branches/emergence-site/site-root/css/lib/_bootstrap-combobox.toml b/.holo/branches/emergence-site/site-root/css/lib/_bootstrap-combobox.toml index 542d1178..7da7b505 100644 --- a/.holo/branches/emergence-site/site-root/css/lib/_bootstrap-combobox.toml +++ b/.holo/branches/emergence-site/site-root/css/lib/_bootstrap-combobox.toml @@ -2,5 +2,4 @@ root = "css" files = [ "bootstrap-combobox.css" -] -after = [ "skeleton-v2" ] \ No newline at end of file +] \ No newline at end of file diff --git a/.holo/branches/emergence-site/site-root/css/lib/_select2.toml b/.holo/branches/emergence-site/site-root/css/lib/_select2.toml index 8afe7ca6..f1880cb6 100644 --- a/.holo/branches/emergence-site/site-root/css/lib/_select2.toml +++ b/.holo/branches/emergence-site/site-root/css/lib/_select2.toml @@ -3,4 +3,3 @@ root = "dist/css" files = [ "select2.css" ] -after = [ "skeleton-v2" ] diff --git a/.holo/branches/emergence-site/site-root/js/lib/_bootstrap-combobox.toml b/.holo/branches/emergence-site/site-root/js/lib/_bootstrap-combobox.toml index 86f65e7c..ba07fd5d 100644 --- a/.holo/branches/emergence-site/site-root/js/lib/_bootstrap-combobox.toml +++ b/.holo/branches/emergence-site/site-root/js/lib/_bootstrap-combobox.toml @@ -2,5 +2,4 @@ root = "js" files = [ "bootstrap-combobox.js" -] -after = [ "skeleton-v2" ] \ No newline at end of file +] \ No newline at end of file diff --git a/.holo/branches/emergence-site/site-root/js/lib/_select2.toml b/.holo/branches/emergence-site/site-root/js/lib/_select2.toml index 23ebca74..aa32df79 100644 --- a/.holo/branches/emergence-site/site-root/js/lib/_select2.toml +++ b/.holo/branches/emergence-site/site-root/js/lib/_select2.toml @@ -3,4 +3,3 @@ root = "dist/js" files = [ "select2.js" ] -after = [ "skeleton-v2" ] diff --git a/.holo/branches/example-codeforphilly/_codeforphilly.toml b/.holo/branches/example-codeforphilly/_codeforphilly.toml deleted file mode 100644 index 544f9d83..00000000 --- a/.holo/branches/example-codeforphilly/_codeforphilly.toml +++ /dev/null @@ -1,3 +0,0 @@ -[holomapping] -files = "*/**" -after = [ "-skeleton" ] diff --git a/.holo/branches/example-codeforphilly/_laddr.toml b/.holo/branches/example-codeforphilly/_laddr.toml deleted file mode 100644 index ec467ed6..00000000 --- a/.holo/branches/example-codeforphilly/_laddr.toml +++ /dev/null @@ -1,3 +0,0 @@ -[holomapping] -holosource = "-skeleton" -files = "*/**" diff --git a/.holo/sources/-skeleton.toml b/.holo/sources/-skeleton.toml deleted file mode 100644 index 89884076..00000000 --- a/.holo/sources/-skeleton.toml +++ /dev/null @@ -1,2 +0,0 @@ -[holosource.project] -holobranch = "emergence-skeleton" diff --git a/.holo/sources/codeforphilly.toml b/.holo/sources/codeforphilly.toml deleted file mode 100644 index c84c3da8..00000000 --- a/.holo/sources/codeforphilly.toml +++ /dev/null @@ -1,3 +0,0 @@ -[holosource] -url = "https://github.com/CodeForPhilly/codeforphilly.org" -ref = "refs/heads/master" diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml index 987aed69..e14284fc 100644 --- a/.holo/sources/skeleton-v2.toml +++ b/.holo/sources/skeleton-v2.toml @@ -1,3 +1,3 @@ [holosource] url = "https://github.com/JarvusInnovations/emergence-skeleton-v2" -ref = "refs/heads/emergence/skeleton" +ref = "refs/heads/emergence/skeleton/v2" diff --git a/.studiorc b/.studiorc index e682e5d4..66daba17 100644 --- a/.studiorc +++ b/.studiorc @@ -1,4 +1,3 @@ #!/bin/bash - hab pkg install emergence/studio source "$(hab pkg path emergence/studio)/studio.sh"