summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-12-19 13:29:30 -0800
committerGitHub <noreply@github.com>2019-12-19 13:29:30 -0800
commitd83959886d40780889dccef4b916765d191b2171 (patch)
tree0fc8770177cf256804bbf3c4bee202efbda83c80
parentb07550b9867c817db57c66898b79b8c33fca5bf0 (diff)
parentd2cf2a9c74b43d9d8099364c01525546ac67cc87 (diff)
downloadmixlib-cli-d83959886d40780889dccef4b916765d191b2171.tar.gz
Merge pull request #75 from chef/testing++
Test on Ruby 2.7 + random testing improvements
-rw-r--r--.expeditor/config.yml1
-rwxr-xr-x.expeditor/run_linux_tests.sh53
-rw-r--r--.expeditor/verify.pipeline.yml22
-rw-r--r--.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md2
-rw-r--r--.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md2
-rw-r--r--Gemfile4
6 files changed, 71 insertions, 13 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index a12a3fd..dbbf886 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -1,5 +1,6 @@
# 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-found-notify
diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh
new file mode 100755
index 0000000..4c14c80
--- /dev/null
+++ b/.expeditor/run_linux_tests.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# This script runs a passed in command, but first setups up the bundler caching on the repo
+
+set -ue
+
+export USER="root"
+
+echo "--- dependencies"
+export LANG=C.UTF-8 LANGUAGE=C.UTF-8
+S3_URL="s3://public-cd-buildkite-cache/${BUILDKITE_PIPELINE_SLUG}/${BUILDKITE_LABEL}"
+
+pull_s3_file() {
+ aws s3 cp "${S3_URL}/$1" "$1" || echo "Could not pull $1 from S3"
+}
+
+push_s3_file() {
+ if [ -f "$1" ]; then
+ aws s3 cp "$1" "${S3_URL}/$1" || echo "Could not push $1 to S3 for caching."
+ fi
+}
+
+apt-get update -y
+apt-get install awscli -y
+
+echo "--- bundle install"
+pull_s3_file "bundle.tar.gz"
+pull_s3_file "bundle.sha256"
+
+if [ -f bundle.tar.gz ]; then
+ tar -xzf bundle.tar.gz
+fi
+
+if [ -n "${RESET_BUNDLE_CACHE:-}" ]; then
+ rm bundle.sha256
+fi
+
+bundle config --local path vendor/bundle
+bundle install --jobs=7 --retry=3
+
+echo "--- bundle cache"
+if test -f bundle.sha256 && shasum --check bundle.sha256 --status; then
+ echo "Bundled gems have not changed. Skipping upload to s3"
+else
+ echo "Bundled gems have changed. Uploading to s3"
+ shasum -a 256 Gemfile.lock > bundle.sha256
+ tar -czf bundle.tar.gz vendor/
+ push_s3_file bundle.tar.gz
+ push_s3_file bundle.sha256
+fi
+
+echo "+++ bundle exec task"
+bundle exec $1
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 7865325..ea2b9f8 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -8,30 +8,34 @@ steps:
- label: run-lint-and-specs-ruby-2.4
command:
- - bundle install --jobs=7 --retry=3 --without docs debug
- - bundle exec rake
+ - .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
- image: ruby:2.4-stretch
+ image: ruby:2.4-buster
- label: run-lint-and-specs-ruby-2.5
command:
- - bundle install --jobs=7 --retry=3 --without docs debug
- - bundle exec rake
+ - .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
- image: ruby:2.5-stretch
+ image: ruby:2.5-buster
- label: run-lint-and-specs-ruby-2.6
command:
- - bundle install --jobs=7 --retry=3 --without docs debug
- - bundle exec rake
+ - .expeditor/run_linux_tests.sh rake
+ expeditor:
+ executor:
+ docker:
+ image: ruby:2.6-buster
+- label: run-lint-and-specs-ruby-2.7rc
+ command:
+ - .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
- image: ruby:2.6-stretch
+ image: ruby:2.7-rc-buster
- label: run-specs-windows
command:
diff --git a/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md
index f28915b..87ac9b4 100644
--- a/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md
@@ -1,7 +1,7 @@
---
name: � Bug Report
about: If something isn't working as expected �.
-labels: "Status: Untriaged"
+labels: "Status: Untriaged, Type: Bug"
---
# Version:
diff --git a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md
index 9f4a958..9508b09 100644
--- a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md
+++ b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md
@@ -1,7 +1,7 @@
---
name: Design Proposal
about: I have a significant change I would like to propose and discuss before starting
-labels: "Status: Untriaged"
+labels: "Status: Untriaged, Type: Design Proposal"
---
### When a Change Needs a Design Proposal
diff --git a/Gemfile b/Gemfile
index 8be580d..a5b7655 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,9 @@ source "https://rubygems.org"
gemspec
group :docs do
- gem "yard"
- gem "redcarpet"
gem "github-markup"
+ gem "redcarpet"
+ gem "yard"
end
group :test do