summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-12-02 21:26:53 -0800
committerTim Smith <tsmith@chef.io>2018-12-02 21:29:28 -0800
commitd104078c9882fd23471eae8fc83a4071871a74b9 (patch)
tree59f3201727f26d91b0e24dc86ec6939357b16436
parent2c8f1dbcd6346c48c3598a7660bc68b2b60141f5 (diff)
downloadmixlib-shellout-appveyor.tar.gz
Test on Ruby 2.4 in Appveyor and ruby-head in Travisappveyor
Also skip the tests when expeditor commits. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.travis.yml19
-rw-r--r--appveyor.yml13
2 files changed, 25 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 7b32643..57bf724 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,21 @@
+sudo: false
language: ruby
cache: bundler
-sudo: false
-rvm:
- - 2.2.10
- - 2.3.7
- - 2.4.4
- - 2.5.3
+
+matrix:
+ include:
+ - rvm: 2.2.10
+ - rvm: 2.3.8
+ - rvm: 2.4.5
+ - rvm: 2.5.3
+ - rvm: ruby-head
+ allow_failures:
+ - rvm: ruby-head
+
branches:
only:
- master
+
before_install:
- gem update bundler
- gem update --system
diff --git a/appveyor.yml b/appveyor.yml
index 2276bde..72bec70 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,8 @@ environment:
matrix:
- ruby_version: "22"
- ruby_version: "23"
- - ruby_version: "23-x64"
+ - ruby_version: "24"
+ - ruby_version: "24-x64"
clone_folder: c:\projects\mixlib-shellout
clone_depth: 1
@@ -17,6 +18,16 @@ branches:
only:
- master
+skip_commits:
+ # version bumps by Expeditor happen as a separate commit after the merge, we can skip
+ author: Chef Expeditor
+ # if ONLY the files listed below are changed in a commit, skip
+ files:
+ - MAINTAINERS.md
+ - MAINTAINERS.toml
+ - CHANGELOG.md
+ - RELEASE_NOTES.md
+
install:
- SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
- echo %PATH%