diff options
| author | Thom May <thom@chef.io> | 2018-01-19 14:52:27 +0000 |
|---|---|---|
| committer | Thom May <thom@chef.io> | 2018-01-19 15:25:43 +0000 |
| commit | eb622fc5d5aade73e614a111a2dd896c490ce80e (patch) | |
| tree | 069a84f0f516d6095f2a4f1fc923ff36d7f7356e | |
| parent | 3b6800b84eeb7bd8f84a748ac6734104fdac04b4 (diff) | |
| download | chef-eb622fc5d5aade73e614a111a2dd896c490ce80e.tar.gz | |
begin the Chef Client 13 branch
Signed-off-by: Thom May <thom@chef.io>
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rw-r--r-- | appveyor.yml | 1 |
3 files changed, 4 insertions, 23 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 2487aa5bab..8a856ee5ba 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -34,6 +34,8 @@ github: # for building. release_branch: - master: + version_constraint: 14.* + - chef-13: version_constraint: 13.* - chef-12: version_constraint: 12.* diff --git a/.travis.yml b/.travis.yml index 2b3b582694..4849604a80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ before_script: branches: only: - master + - chef-13 - chef-12 env: @@ -43,12 +44,6 @@ matrix: script: sudo -E $(which bundle) exec rake spec:integration; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: - INTEGRATION_SPECS_25: 1 - rvm: 2.5.0 - sudo: true - script: sudo -E $(which bundle) exec rake spec:integration; - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - - env: FUNCTIONAL_SPECS_23: 1 rvm: 2.3.5 sudo: true @@ -61,12 +56,6 @@ matrix: script: sudo -E $(which bundle) exec rake spec:functional; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: - FUNCTIONAL_SPECS_25: 1 - rvm: 2.5.0 - sudo: true - script: sudo -E $(which bundle) exec rake spec:functional; - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - - env: UNIT_SPECS_23: 1 rvm: 2.3.5 sudo: true @@ -83,14 +72,6 @@ matrix: - sudo -E $(which bundle) exec rake component_specs bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: - UNIT_SPECS_25: 1 - rvm: 2.5.0 - sudo: true - script: - - sudo -E $(which bundle) exec rake spec:unit; - - sudo -E $(which bundle) exec rake component_specs - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - - env: CHEFSTYLE: 1 rvm: 2.4.3 script: bundle exec rake style @@ -373,6 +354,3 @@ notifications: on_failure: true on_success: change on_pull_requests: false - irc: - channels: - - chat.freenode.net#chef-hacking diff --git a/appveyor.yml b/appveyor.yml index aa9fb93902..30af2ea6d8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,6 +18,7 @@ skip_tags: true branches: only: - master + - chef-13 - chef-12 install: |