Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rubygems-update for ruby older than 2.3 for travis and gitlab-ci #171

Merged
merged 1 commit into from
Dec 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
- env: CHECK=parallel_spec
- env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
rvm: 2.4.4
- env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
- env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8
rvm: 2.1.9
deploy: true
user: 'puppet'
Expand Down Expand Up @@ -594,6 +594,7 @@ Gemfile:
checks:
- parallel_spec
puppet_version: '~> 4.0'
rubygems_version: '2.7.8'
'2.4.4':
checks:
- 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
Expand Down
5 changes: 4 additions & 1 deletion moduleroot/.gitlab-ci.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ before_script:
- bundle config mirror.http://rubygems.org/ <%= configs['rubygems_mirror'] %>
- bundle config mirror.https://rubygems.org/ <%= configs['rubygems_mirror'] %>
<% end -%>
- gem update --system
- gem update --system $RUBYGEMS_VERSION
- gem --version
- bundle -v
- bundle install <%= configs['bundler_args'] %>
Expand All @@ -68,6 +68,9 @@ before_script:
- bundle exec rake <%= check %>
variables:
PUPPET_GEM_VERSION: '<%= options['puppet_version'] %>'
<% if options['rubygems_version'] -%>
RUBYGEMS_VERSION: '<%= options['rubygems_version'] -%>'
<% end -%>
<% if options['allow_failure'] -%>
<% if options['allow_failure'].include?(check) -%>
allow_failure: true
Expand Down
2 changes: 1 addition & 1 deletion moduleroot/.travis.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ addons:
before_install:
- bundle -v
- rm -f Gemfile.lock
- gem update --system
- gem update --system $RUBYGEMS_VERSION
- gem --version
- bundle -v
script:
Expand Down