summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-11-05 13:31:46 -0700
committerTim Smith <tsmith84@gmail.com>2021-11-05 13:31:46 -0700
commit7f5bc59358f5f8047264d52839d8e3f6de50e316 (patch)
treedb9552d492b52477cb5eb646d7652db4318612b0
parent18b62feafbf4173bfddc7b024335f199cd9bb4f2 (diff)
downloadohai-7f5bc59358f5f8047264d52839d8e3f6de50e316.tar.gz
Add execution of Ohai in GitHub Actions
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/verify.pipeline.yml52
-rw-r--r--.github/workflows/exec.yml26
-rw-r--r--.github/workflows/lint.yml2
3 files changed, 27 insertions, 53 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
deleted file mode 100644
index 763e633c..00000000
--- a/.expeditor/verify.pipeline.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-expeditor:
- defaults:
- buildkite:
- retry:
- automatic:
- limit: 1
- timeout_in_minutes: 30
-
-steps:
-- label: lint-chefstyle
- command:
- - .expeditor/run_linux_tests.sh "rake style"
- expeditor:
- executor:
- docker:
- image: ruby:2.7-buster
-
-- label: run-ohai
- command:
- - .expeditor/run_linux_tests.sh "bundle exec ohai"
- expeditor:
- executor:
- docker:
- image: ruby:2.7-buster
-
-- label: run-specs-ruby-2.6
- command:
- - .expeditor/run_linux_tests.sh rspec
- expeditor:
- executor:
- docker:
- image: ruby:2.6-buster
-
-- label: run-specs-ruby-2.7
- command:
- - .expeditor/run_linux_tests.sh rspec
- expeditor:
- executor:
- docker:
- image: ruby:2.7-buster
-
-- label: run-specs-windows
- command:
- # we need the ruby 2.7 version of bundler, the 2.5/2.6 versions cannot pull our Gemfile correctly
- - gem install bundler
- - bundle install --jobs=7 --retry=3 --without=profile
- - bundle exec rake spec
- expeditor:
- executor:
- docker:
- host_os: windows
diff --git a/.github/workflows/exec.yml b/.github/workflows/exec.yml
new file mode 100644
index 00000000..16972db8
--- /dev/null
+++ b/.github/workflows/exec.yml
@@ -0,0 +1,26 @@
+---
+name: exec
+
+'on':
+ pull_request:
+ push:
+ branches:
+ - main
+ - 16-stable
+
+jobs:
+ test:
+ strategy:
+ fail-fast: false
+ matrix:
+ os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
+ ruby: ['2.6', '2.7']
+ name: Exec Ohai on ${{ matrix.os }} with Ruby ${{ matrix.ruby }}
+ runs-on: ${{ matrix.os }}
+ steps:
+ - uses: actions/checkout@v2
+ - uses: ruby/setup-ruby@v1
+ with:
+ ruby-version: ${{ matrix.ruby }}
+ bundler-cache: true
+ - run: bundle exec ohai
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 49e80e93..f081d573 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
- ruby-version: 2.7
+ ruby-version: 2.6
bundler-cache: true
- uses: r7kamura/rubocop-problem-matchers-action@v1 # this shows the failures in the PR
- run: bundle exec chefstyle