Skip to content

Commit 23e35dd

Browse files
authored
Fix CI tests (#642)
1 parent ece5a0d commit 23e35dd

4 files changed

Lines changed: 103 additions & 101 deletions

File tree

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ jobs:
229229
- run:
230230
name: Run tests
231231
command: |
232+
set -e
232233
choco install ruby --allow-downgrade -y --version 2.5.3.101 # Keep version in sync with next command!
233234
export PATH=/c/tools/ruby25/bin:$PATH # Make Ruby 2.5 take precedence over the pre-installed 2.6
234235
ruby --version
235-
choco install msys2 --allow-downgrade -y --version 20180531.0.0
236+
choco install msys2 --allow-downgrade -y --version 20200903.0.0
236237
ridk.cmd exec pacman -S --noconfirm --needed base-devel mingw-w64-x86_64-toolchain
237-
powershell kill -n gpg-agent # Started by msys, if we don't kill it the job stays running forever (found by running 'ps -W' before and after the last two commands)
238238
gem install bundler -v 1.17.3
239239
rm Gemfile.lock && bundle install --path .bundle
240240
bundle exec rake test

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ group :development do
2020
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2121
gem "librarian-puppet"
2222
gem "kitchen-puppet"
23-
gem "kitchen-vagrant"
2423
gem "kitchen-docker"
2524
gem "kitchen-verifier-serverspec"
25+
gem "mixlib-shellout", "~> 2.2.7", platforms: [:ruby]
2626

2727
if RUBY_VERSION >= '2.3'
28-
gem "test-kitchen"
28+
gem "test-kitchen", '~> 2.5.4'
2929
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
3030
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
3131
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
@@ -40,5 +40,6 @@ group :development do
4040
gem "rubocop", "~> 0.49.1"
4141
gem "rubocop-i18n", "~> 1.2.0"
4242
gem "rubocop-rspec", "~> 1.16.0"
43+
gem "artifactory", "~> 2.8.2"
4344
end
4445
end

0 commit comments

Comments
 (0)