summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-04-10 18:58:01 +0100
committerThom May <thom@chef.io>2017-04-10 18:58:01 +0100
commit73f219012c0596dc56e5e7359e1c5436f8c4fdcd (patch)
tree70f33e3cab2d9f5273d76ff48b8656204c99ac7a
parentc6b4ed4b4726dfc9375b5acb0a06286f2f21262e (diff)
downloadchef-73f219012c0596dc56e5e7359e1c5436f8c4fdcd.tar.gz
Enable travis testing for chef-12 branchtm/en_travisify
Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 85881f6f18..e25c8535bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ before_script:
branches:
only:
- master
- - 11-stable
+ - chef-12
env:
global:
diff --git a/appveyor.yml b/appveyor.yml
index bb15c065a7..c4d7dfcffc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,6 +15,7 @@ skip_tags: true
branches:
only:
- master
+ - chef-12
install:
- systeminfo