diff options
| -rw-r--r-- | .bldr.toml | 5 | ||||
| -rw-r--r-- | .expeditor/build.habitat.yml | 2 | ||||
| -rw-r--r-- | .expeditor/config.yml | 7 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md | 3 | ||||
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
9 files changed, 24 insertions, 17 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" diff --git a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md index 2925c0d0d1..ff55a6583c 100644 --- a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md +++ b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md @@ -1,7 +1,6 @@ --- -name: :pencil2: Design Proposal +name: Design Proposal about: I have a significant change I would like to propose and discuss before starting - --- ### When a Change Needs a Design Proposal diff --git a/CHANGELOG.md b/CHANGELOG.md index 433cd640a4..76dbfcd7ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,17 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.0.197 --> -## [v15.0.197](https://github.com/chef/chef/tree/v15.0.197) (2019-03-27) +<!-- latest_release 15.0.199 --> +## [v15.0.199](https://github.com/chef/chef/tree/v15.0.199) (2019-04-01) #### Merged Pull Requests -- Update win32-service gem and fix #8195 [#8322](https://github.com/chef/chef/pull/8322) ([jasonwbarnett](https://github.com/jasonwbarnett)) +- Remove Ubuntu 14.04 testing [#8330](https://github.com/chef/chef/pull/8330) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup --> ### Changes since latest stable release #### Merged Pull Requests +- Remove Ubuntu 14.04 testing [#8330](https://github.com/chef/chef/pull/8330) ([tas50](https://github.com/tas50)) <!-- 15.0.199 --> +- Update InSpec to 3.7.11 and mixlib-cli to 2.0.3 [#8329](https://github.com/chef/chef/pull/8329) ([tas50](https://github.com/tas50)) <!-- 15.0.198 --> - Update win32-service gem and fix #8195 [#8322](https://github.com/chef/chef/pull/8322) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 15.0.197 --> - Update chef-zero to 14.0.12 [#8312](https://github.com/chef/chef/pull/8312) ([tas50](https://github.com/tas50)) <!-- 15.0.196 --> - Remove the travis gem from our gemfile [#8310](https://github.com/chef/chef/pull/8310) ([tas50](https://github.com/tas50)) <!-- 15.0.195 --> diff --git a/Gemfile.lock b/Gemfile.lock index 81f91cb96d..a8fed56b5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,10 +27,10 @@ GIT PATH remote: . specs: - chef (15.0.197) + chef (15.0.199) addressable bundler (>= 1.10) - chef-config (= 15.0.197) + chef-config (= 15.0.199) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -51,10 +51,10 @@ PATH proxifier (~> 1.0) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (15.0.197-universal-mingw32) + chef (15.0.199-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 15.0.197) + chef-config (= 15.0.199) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -92,7 +92,7 @@ PATH PATH remote: chef-config specs: - chef-config (15.0.197) + chef-config (15.0.199) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -15.0.197
\ No newline at end of file +15.0.199
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index ec850353c0..85a31091c9 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "15.0.197".freeze + VERSION = "15.0.199".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 2bc333fc3d..9075262c43 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("15.0.197") + VERSION = Chef::VersionString.new("15.0.199") end # |