summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-06-20 18:15:46 +0100
committerGitHub <noreply@github.com>2019-06-20 18:15:46 +0100
commitfa41ed1cb51c2a08d162514bb0fe85dd66b4f96e (patch)
tree0ce3b963e07cc2517ac8a417fa5be0eda4c7fbaf
parentb99c1c2f4530df354ea2d5bb94614c7b70baf858 (diff)
parent7fb3eb07e7d7b8bf6ae7be033e3820ee9f3ea564 (diff)
downloadchef-fa41ed1cb51c2a08d162514bb0fe85dd66b4f96e.tar.gz
Merge pull request #8677 from echohack/habitat-expeditor
[chef-client] [scaffolding-chef] add new build configuration for scaffolding-chef
-rw-r--r--.bldr.toml8
-rw-r--r--habitat-packages/.bldr.toml4
2 files changed, 8 insertions, 4 deletions
diff --git a/.bldr.toml b/.bldr.toml
index f819d2b445..190969c79d 100644
--- a/.bldr.toml
+++ b/.bldr.toml
@@ -1,5 +1,13 @@
[chef-client]
+plan_path = "habitat-packages/chef-client"
build_targets = [
"x86_64-linux",
"x86_64-linux-kernel2"
]
+[scaffolding-chef]
+plan_path = "habitat-packages/scaffolding-chef"
+build_targets = [
+ "x86_64-linux",
+ "x86_64-linux-kernel2"
+ # "x86_64-windows" --- TODO: Expeditor does not currently support Windows, but will in the coming weeks. Uncomment me soon!
+]
diff --git a/habitat-packages/.bldr.toml b/habitat-packages/.bldr.toml
deleted file mode 100644
index a58453e9a6..0000000000
--- a/habitat-packages/.bldr.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[chef-client]
-plan_path = "chef-client/*"
-[scaffolding-chef]
-plan_path = "scaffolding-chef/*"