Merge pull request #1362 from chef/ohai_require

Require ohai/version where we use it

5 files changed, 62 insertions, 42 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 5250587d..5558ef15 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
+  notify_channel: chef-infra-notify
 
+# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
 rubygems:
   - ohai
 
@@ -14,7 +15,10 @@ github:
   version_tag_format: "v{{version}}"
   # allow bumping the minor release via label
   minor_bump_labels:
-    - "Expeditor: Bump Minor Version"
+    - "Expeditor: Bump Version Minor"
+  # allow bumping the major release via label
+  major_bump_labels:
+    - "Expeditor: Bump Version Major"
   # 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.
@@ -26,6 +30,9 @@ github:
     - 13-stable:
         version_constraint: 13.*
 
+changelog:
+  rollup_header: Changes not yet released to rubygems.orgs
+
 promote:
   actions:
     - built_in:rollover_changelog
@@ -41,7 +48,12 @@ 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
+
+pipelines:
+  - verify:
+      description: Pull Request validation tests
+      public: true
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
new file mode 100644
index 00000000..120884cd
--- /dev/null
+++ b/.expeditor/verify.pipeline.yml
@@ -0,0 +1,35 @@
+steps:
+
+- label: lint-chefstyle
+  command:
+    - bundle install --jobs=7 --retry=3
+    - bundle exec chefstyle
+  expeditor:
+    executor:
+      docker:
+
+- label: run-ohai
+  command:
+    - bundle install --jobs=7 --retry=3
+    - bundle exec ohai
+  expeditor:
+    executor:
+      docker:
+
+- label: run-specs-ruby-2.5
+  command:
+    - asdf local ruby 2.5.5
+    - bundle install --jobs=7 --retry=3
+    - bundle exec rake
+  expeditor:
+    executor:
+      docker:
+
+- label: run-specs-ruby-2.6
+  command:
+    - asdf local ruby 2.6.2
+    - bundle install --jobs=7 --retry=3
+    - bundle exec rake
+  expeditor:
+    executor:
+      docker:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c77dc12d..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: ruby
-cache: bundler
-dist: xenial
-sudo: false
-
-branches:
-  only:
-    - master
-    - 14-stable
-    - 13-stable
-
-bundler_args: --jobs 7 --without docs debug
-
-before_install:
-  - gem --version
-  - rvm @global do gem uninstall bundler -a -x -I || true
-  - gem install bundler
-  - bundle --version
-  - rm -f .bundle/config
-rvm:
-  - 2.4.5
-  - 2.5.5
-  - 2.6.2
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
-script:
-  - bundle exec chefstyle -v
-  - bundle exec rake
-  - bundle exec ohai
diff --git a/appveyor.yml b/appveyor.yml
index bc3a43f5..27bd3995 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,9 +4,12 @@ os: Windows Server 2012 R2
 platform:
   - x64
 
+cache:
+  - vendor/bundle
 environment:
   matrix:
-    - ruby_version: "24"  
+    - ruby_version: 24-x64
+    - ruby_version: 25-x64
 
 clone_folder: c:\projects\ohai
 clone_depth: 1
@@ -30,13 +33,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
diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb
index b6056d37..9a4ebc92 100644
--- a/lib/ohai/system.rb
+++ b/lib/ohai/system.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2017, Chef Software Inc.
+# Copyright:: Copyright (c) 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require "ohai/version"
 require "ohai/loader"
 require "ohai/log"
 require "ohai/mash"