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

Update dependencies and fix tests (hopefully) #178

Merged
merged 9 commits into from
Apr 17, 2020
Merged

Conversation

36degrees
Copy link
Contributor

Update all the things, which should hopefully fix CI that's currently failing master.

Suggest reviewing commit-by-commit.

This will hopefully fix errors seen on CI and locally:

> Bundler could not find compatible versions for gem "bundler":
>  In Gemfile:
>     bundler (~> 2.0.1)
>   Current Bundler version:
>     bundler (2.1.4)
> This Gemfile requires a different version of Bundler.
> Perhaps you need to update Bundler by running `gem install bundler`?
This should fix these errors seen on CI and locally:

> rubocop example lib spec Rakefile
> /home/travis/.rvm/gems/ruby-2.6.3/gems/rubocop-govuk-1.0.0/config/gds-ruby-styleguide.yml: Metrics/LineLength has the wrong namespace - should be Layout
> Error: The `Layout/AlignArray` cop has been renamed to `Layout/ArrayAlignment`.
> (obsolete configuration found in /home/travis/.rvm/gems/ruby-2.6.3/gems/rubocop-govuk-1.0.0/config/gds-ruby-styleguide.yml, please update it)
> The `Layout/Tab` cop has been renamed to `Layout/IndentationStyle`.
> (obsolete configuration found in /home/travis/.rvm/gems/ruby-2.6.3/gems/rubocop-govuk-1.0.0/config/gds-ruby-styleguide.yml, please update it)
> The `Layout/TrailingBlankLines` cop has been renamed to `Layout/TrailingEmptyLines`.
> (obsolete configuration found in /home/travis/.rvm/gems/ruby-2.6.3/gems/rubocop-govuk-1.0.0/config/gds-ruby-styleguide.yml, please update it)
> The `Lint/StringConversionInInterpolation` cop has been renamed to `Lint/RedundantStringCoercion`.
> (obsolete configuration found in /home/travis/.rvm/gems/ruby-2.6.3/gems/rubocop-govuk-1.0.0/config/gds-ruby-styleguide.yml, please update it)
> obsolete parameter Whitelist (for Style/TrivialAccessors) found in /home/travis/.rvm/gems/ruby-2.6.3/gems/rubocop-govuk-1.0.0/config/gds-ruby-styleguide.yml
> `Whitelist` has been renamed to `AllowedMethods`.
Error: The `Layout/IndentHeredoc` cop has been renamed to `Layout/HeredocIndentation`.
(obsolete configuration found in .rubocop.yml, please update it)
lib/govuk_tech_docs/api_reference/api_reference_extension.rb:81:13: C: Style/RedundantReturn: Redundant return detected. (https://rubystyle.guide#no-explicit-return)
            return text
            ^^^^^^
Rakefile:9:1: C: Rake/Desc: Describe the task with desc method.
task :lint do
^^^^^^^^^^
@36degrees
Copy link
Contributor Author

@tijmenb thanks for the approval! Hope you're doing alright 👋

@36degrees 36degrees merged commit d908439 into master Apr 17, 2020
@36degrees 36degrees deleted the housekeeping branch April 17, 2020 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants