diff options
author | Tim Smith <tsmith@chef.io> | 2020-07-16 12:10:23 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-16 12:10:23 -0700 |
commit | 6eaf874488946809c90ac0c3e6d03af46a96fbba (patch) | |
tree | 5e5ca5934fd3afcd2c80b00d17101e9692306d03 | |
parent | 6a2881a025bce21ed795eeeb53ba0a4fc7685349 (diff) | |
parent | 980273850942b455fa5901095b0b3469b8393a55 (diff) | |
download | mixlib-shellout-6eaf874488946809c90ac0c3e6d03af46a96fbba.tar.gz |
Merge pull request #208 from chef/ci_fixup
Test on Ruby 2.7 final, update chefstyle, and other CI fixes
-rwxr-xr-x | .expeditor/run_linux_tests.sh | 41 | ||||
-rw-r--r-- | .expeditor/verify.pipeline.yml | 16 | ||||
-rw-r--r-- | .rspec | 2 | ||||
-rw-r--r-- | .rubocop.yml | 2 | ||||
-rw-r--r-- | Gemfile | 6 | ||||
-rw-r--r-- | spec/mixlib/shellout_spec.rb | 2 |
6 files changed, 17 insertions, 52 deletions
diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh index e4a855d..7df1936 100755 --- a/.expeditor/run_linux_tests.sh +++ b/.expeditor/run_linux_tests.sh @@ -5,49 +5,12 @@ 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 --without docs debug - -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 +bundle install --jobs=7 --retry=3 echo "+++ bundle exec task" -bundle exec $1 +bundle exec $@ diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index b1217e5..ba3874e 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -1,14 +1,18 @@ --- expeditor: + cached_folders: + - vendor defaults: buildkite: + retry: + automatic: + limit: 1 timeout_in_minutes: 30 steps: - label: run-lint-and-specs-ruby-2.4 command: - - export USER="root" - .expeditor/run_linux_tests.sh rake expeditor: executor: @@ -17,7 +21,6 @@ steps: - label: run-lint-and-specs-ruby-2.5 command: - - export USER="root" - .expeditor/run_linux_tests.sh rake expeditor: executor: @@ -26,25 +29,24 @@ steps: - label: run-lint-and-specs-ruby-2.6 command: - - export USER="root" - .expeditor/run_linux_tests.sh rake expeditor: executor: docker: image: ruby:2.6-buster -- label: run-lint-and-specs-ruby-2.7rc +- label: run-lint-and-specs-ruby-2.7 command: - - export USER="root" - .expeditor/run_linux_tests.sh rake expeditor: executor: docker: - image: ruby:2.7-rc-buster + image: ruby:2.7-buster - label: run-specs-windows command: - - bundle install --jobs=7 --retry=3 --without docs debug + - bundle config --local path vendor/bundle + - bundle install --jobs=7 --retry=3 - bundle exec rake expeditor: executor: @@ -1 +1 @@ --cf documentation +-f documentation --color diff --git a/.rubocop.yml b/.rubocop.yml index e9fb15f..1fa58bf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.2 + TargetRubyVersion: 2.4 Lint/UnderscorePrefixedVariableName: Exclude: @@ -9,14 +9,14 @@ group :docs do end group :test do - gem "chefstyle", "~> 0.11.0" # still supports Ruby 2.2 TargetRubyVersion + gem "chefstyle", "1.2.0" gem "rspec", "~> 3.0" gem "rake" end group :debug do gem "pry" - gem "pry-byebug", "~> 3.6.0" # Pinned for ruby 2.2 - gem "pry-stack_explorer" + gem "pry-byebug" + gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6 gem "rb-readline" end diff --git a/spec/mixlib/shellout_spec.rb b/spec/mixlib/shellout_spec.rb index da3e543..35757eb 100644 --- a/spec/mixlib/shellout_spec.rb +++ b/spec/mixlib/shellout_spec.rb @@ -387,7 +387,7 @@ describe Mixlib::ShellOut do it "should preserve custom variables" do expect(shell_cmd.process_environment["PATH"]).to eq("/lord:/of/the/dance") end - # Setting the user with additional env variables should have both + # Setting the user with additional env variables should have both it "should allow new variables" do expect(shell_cmd.process_environment["CUSTOM"]).to eq("costume") end |