summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-10-26 12:27:18 -0700
committerTim Smith <tsmith@chef.io>2018-10-26 12:27:18 -0700
commita890a164dc3128137203b9a5bd1b4d5c86a0da54 (patch)
tree967581aaf5e931689d867f9c785b9957cf0fb0c6
parent308a32b138ac700d1ecd39cb67b2ebfbd338fad7 (diff)
downloadohai-a890a164dc3128137203b9a5bd1b4d5c86a0da54.tar.gz
Update appveyor and travis for the 14-stable branch
Prep branching for Ohai 15 Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.travis.yml1
-rw-r--r--appveyor.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 25a09de6..bb8a682d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ sudo: false
branches:
only:
- master
+ - 14-stable
- 13-stable
bundler_args: --jobs 7 --without docs debug
diff --git a/appveyor.yml b/appveyor.yml
index 0883b614..bc3a43f5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,6 +25,7 @@ skip_tags: true
branches:
only:
- master
+ - 14-stable
- 13-stable
install: