Skip to content

Commit

Permalink
Update to latest ruby version supported by the agent
Browse files Browse the repository at this point in the history
Amongst other things, this avoids a ruby segfault with concurrent-ruby-1.1.6 (see ruby-concurrency/concurrent-ruby#849)
  • Loading branch information
DavidS committed Feb 20, 2020
1 parent 522fe70 commit c446cfa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -112,7 +112,7 @@ Travis uses a .travis.yml file in the root of your repository to learn about you
|litmus|Allows you to update default config values. Its sub keys are `provision_list`, `puppet_collection`, `rvm`, `install_wget` which are detailed below.|
|litmus\\**puppet_collection**|Allows you to specify the puppet version under test. Default test are ran on _puppet 5_ and _puppet 6_.|
|litmus\\**provision_list**|Allows you to specify the platforms list under test. Default test are ran on platformes defined in provision.yaml file under _travis_deb_ and _travis_el_|
|litmus\\**rvm**|Allows you to specify the ruby version under test. Default it is set to _2.5.3_|
|litmus\\**rvm**|Allows you to specify the ruby version under test. Default it is set to _2.5.7_|
|litmus\\**install_wget**|Allows you to enable automatic installation of wget on the platform under test. We need this when installing agent on travis_deb platforms. Default it is disabled. |
|user|This string needs to be set to the Puppet Forge user name. To enable deployment the secure key also needs to be set.|
|secure|This string needs to be set to the encrypted password to enable deployment. See [https://docs.travis-ci.com/user/encryption-keys/#usage](https://docs.travis-ci.com/user/encryption-keys/#usage) for instructions on how to encrypt your password.|
Expand Down
10 changes: 5 additions & 5 deletions config_defaults.yml
Expand Up @@ -59,12 +59,12 @@
- spec
- acceptance
ruby_versions:
- 2.5.3
- 2.5.7
bundler_args: --without system_tests
docker_sets:
docker_defaults:
# values will replace @@SET@@ with the docker_sets' value
rvm: 2.5.3
rvm: 2.5.7
sudo: required
dist: trusty
services: docker
Expand All @@ -79,7 +79,7 @@
rvm: 2.4.5
stage: spec
- env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
rvm: 2.5.3
rvm: 2.5.7
stage: spec
branches:
- master
Expand All @@ -88,7 +88,7 @@
litmus:
provision_list: [travis_deb, travis_el]
puppet_collection: [puppet5, puppet6]
rvm: '2.5.3'
rvm: '2.5.7'
install_wget: no
notifications:
email: false
Expand Down Expand Up @@ -603,7 +603,7 @@ Gemfile:
- 'vendor/bundle'
bundler_args: '--without system_tests --path vendor/bundle --jobs $(nproc)'
ruby_versions:
'2.5.3':
'2.5.7':
checks:
- 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
- parallel_spec
Expand Down

0 comments on commit c446cfa

Please sign in to comment.