summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-01-23 15:24:46 -0800
committerTim Smith <tsmith@chef.io>2019-01-23 15:24:46 -0800
commit10bed50238dff31c763ef37a852b221ccb25a3d2 (patch)
treefa6d301fba84ade51297e616d10ed526bf6786cc
parentd96dc696e041b791ee8d182d8b910186ac18d701 (diff)
downloadohai-10bed50238dff31c763ef37a852b221ccb25a3d2.tar.gz
Update appveyor / travis configs and add lockbot
Testing boilerplate PR time! Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/config.yml9
-rw-r--r--.github/lock.yml1
-rw-r--r--.travis.yml1
-rw-r--r--appveyor.yml10
4 files changed, 13 insertions, 8 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 5250587d..1973c3f6 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -1,9 +1,10 @@
-# Documentation available at https://expeditor-docs.es.chef.io/
-
+# Documentation available at https://expeditor.chef.io/docs/getting-started/
+---
# Slack channel in Chef Software slack to send notifications about build failures, etc
slack:
notify_channel: chef-notify
+# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
rubygems:
- ohai
@@ -14,7 +15,7 @@ github:
version_tag_format: "v{{version}}"
# allow bumping the minor release via label
minor_bump_labels:
- - "Expeditor: Bump Minor Version"
+ - "Expeditor: Bump Version Minor"
# Which Github branches to build Omnibus releases from, and what versions
# (as determined by the value in the VERSION file) those branches are responsible
# for building.
@@ -41,7 +42,7 @@ merge_actions:
only_if: built_in:bump_version
- built_in:update_changelog:
ignore_labels:
- - "Expeditor: Exclude From Changelog"
+ - "Expeditor: Skip Changelog"
- "Expeditor: Skip All"
- built_in:build_gem:
only_if: built_in:bump_version
diff --git a/.github/lock.yml b/.github/lock.yml
new file mode 100644
index 00000000..66d5d496
--- /dev/null
+++ b/.github/lock.yml
@@ -0,0 +1 @@
+daysUntilLock: 60
diff --git a/.travis.yml b/.travis.yml
index 3442195c..590bbe43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
language: ruby
cache: bundler
dist: xenial
-sudo: false
branches:
only:
diff --git a/appveyor.yml b/appveyor.yml
index 650aab63..21240d14 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,9 +4,11 @@ os: Windows Server 2012 R2
platform:
- x64
+cache:
+ - vendor/bundle
environment:
matrix:
- - ruby_version: "25"
+ - ruby_version: 25-x64
clone_folder: c:\projects\ohai
clone_depth: 1
@@ -30,13 +32,15 @@ branches:
install:
- SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+ - SET BUNDLE_WITHOUT=debug:docs
- echo %PATH%
+ - gem install bundler --no-document
+ - bundle install --jobs 3 --retry 3
- ruby --version
- gem --version
- bundler --version
-build_script:
- - bundle install || bundle install || bundle install
+build: off
test_script:
- bundle exec rspec