diff options
| author | Tim Smith <tsmith@chef.io> | 2019-04-01 15:14:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-01 15:14:54 -0700 |
| commit | 27b5289e6ed54589d9e9eb9b88f3aef2ffc33f88 (patch) | |
| tree | 20b7b4b32d921b71acdcae1e2fdbf2a4e7fef0eb | |
| parent | 8170b4599cb605b3872b82111b96f4a36c4cca8c (diff) | |
| parent | f1ab7931e628722b00ea71cc8b52750ed8415c36 (diff) | |
| download | chef-27b5289e6ed54589d9e9eb9b88f3aef2ffc33f88.tar.gz | |
Merge pull request #8331 from chef/tduffield/hab-v2
Move to using the v2 Habitat Build functionality
| -rw-r--r-- | .bldr.toml | 5 | ||||
| -rw-r--r-- | .expeditor/build.habitat.yml | 2 | ||||
| -rw-r--r-- | .expeditor/config.yml | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/.bldr.toml b/.bldr.toml new file mode 100644 index 0000000000..f819d2b445 --- /dev/null +++ b/.bldr.toml @@ -0,0 +1,5 @@ +[chef-client] +build_targets = [ + "x86_64-linux", + "x86_64-linux-kernel2" +] diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml new file mode 100644 index 0000000000..4e13b540ec --- /dev/null +++ b/.expeditor/build.habitat.yml @@ -0,0 +1,2 @@ +--- +origin: chef diff --git a/.expeditor/config.yml b/.expeditor/config.yml index a8c308a29e..a023c554ef 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -22,9 +22,8 @@ rubygems: docker_images: - chef -habitat_packages: - - chef-client: - also_build_for_linux_kernel2: true +pipelines: + - habitat/build github: # The file where the MAJOR.MINOR.PATCH version is kept. The version in this file @@ -64,7 +63,7 @@ merge_actions: ignore_labels: - "Expeditor: Skip Changelog" - "Expeditor: Skip All" - - built_in:trigger_habitat_package_build: + - trigger_pipeline:habitat/build: ignore_labels: - "Expeditor: Skip Habitat" - "Expeditor: Skip All" |