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 3-9-maintenance CI failures #2360

Merged
merged 21 commits into from
Jul 28, 2020
Merged

Commits on Jul 27, 2020

  1. Bump Rubies

    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    02858cb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4fcdae4 View commit details
    Browse the repository at this point in the history
  3. Fix gem source mistake

        Could not find gem 'puma' in https://github.com/rails/rails.git (at 5-2-stable@92fd1c2).
        The source does not contain any versions of 'puma'
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    c4ff60b View commit details
    Browse the repository at this point in the history
  4. Provide historical info to avoid confusion

    In this example, we're making sure that `view` is available in global
    config hooks.
    
    `group.run` accepts a reporter, but it defaults to a NullReporter
    anyway.
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    c7b8a6c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6162f89 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8075525 View commit details
    Browse the repository at this point in the history
  7. Cap dependencies for 2.2.10

    When installed from scratch on 2.2.10 with RubyGems 2.3.10 and Bundler
    1.17.3, with RAILS_VERSION set to `5-2-stable`:
    
        childprocess-3.0.0 requires ruby version >= 2.3.0, which is incompatible with the current version, ruby 2.2.10p489
        xpath-3.2.0 requires ruby version >= 2.3, which is incompatible with the current version, ruby 2.2.10p489
        i18n-1.8.3 requires ruby version >= 2.3.0, which is incompatible with the current version, ruby 2.2.10p489
        nio4r-2.5.2 requires ruby version >= 2.3, which is incompatible with the current version, ruby 2.2.10p489
        rack-2.2.3 requires ruby version >= 2.3.0, which is incompatible with the current version, ruby 2.2.10p489
        public_suffix-4.0.5 requires ruby version >= 2.3, which is incompatible with the current version, ruby 2.2.10p489
        rubyzip-2.3.0 requires ruby version >= 2.4, which is incompatible with the current version, ruby 2.2.10p489
    
        sprockets-4.0.2 requires ruby version >= 2.5.0, which is incompatible with the current version, ruby 2.2.10p489
    
    We had sprockets capped, but only for `'~> x.x.x'`/`x.x.x` formats.
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    088bce9 View commit details
    Browse the repository at this point in the history
  8. Add error handling to bundler downgrade

    `set -e` stops the script when a *simple command* fails.
    If the command is part of an `||`-expression, the script continues.
    
    It seems unessential that we fail to uninstall `bundler` from the global
    gemset, the build is green after all.
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    a53facb View commit details
    Browse the repository at this point in the history
  9. Fix sprockets dependency

        actionpack was resolved to 3.2.22.5, which depends on
          sprockets (~> 2.2.1)
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    a7dd9d6 View commit details
    Browse the repository at this point in the history
  10. Drop invalid cop

        Warning: unrecognized cop BinaryOperatorParameterName found in /home/travis/build/rspec/rspec-rails/.rubocop_rspec_base.yml
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    a87877e View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2b1e7fe View commit details
    Browse the repository at this point in the history
  12. Mute RuboCop offence

    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    102ba31 View commit details
    Browse the repository at this point in the history
  13. Remove cops unknown to CI RuboCop version

    RucoCop on CI is fixed at 0.23, and has outdated cop names.
    Even without those disabling, `rubocop lib` passes just fine.
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    f5ebf79 View commit details
    Browse the repository at this point in the history
  14. Fix install-time gem version incompatibilities

        Gem::RuntimeRequirementNotMetError: public_suffix requires Ruby version >= 1.9.3. The current ruby version is 1.8.
        An error occurred while installing public_suffix (1.4.2), and Bundler cannot continue.
    
        Gem::RuntimeRequirementNotMetError: redcarpet requires Ruby version >= 1.9.2. The current ruby version is 1.8.
        An error occurred while installing redcarpet (3.1.1), and Bundler cannot continue.
    
        Gem::RuntimeRequirementNotMetError: rubyzip requires Ruby version >= 1.9.2. The current ruby version is 1.8.
        An error occurred while installing rubyzip (1.0.0), and Bundler cannot continue.
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    bed4459 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    89dd9ec View commit details
    Browse the repository at this point in the history
  16. Test a stable version of Rails 5.2 with Ruby 2.2

    For the reasons described in the comment
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    6a8fd07 View commit details
    Browse the repository at this point in the history
  17. Avoid spring to be bundled

    bundle exec rails new ./tmp/example_app --no-rc --skip-javascript --skip-bootsnap --skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb
    
        Gem::RuntimeRequirementNotMetError: spring requires Ruby version >= 2.4.0. The current ruby version is 2.3.0.
        An error occurred while installing spring (2.1.0), and Bundler cannot continue.
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    0a3703e View commit details
    Browse the repository at this point in the history
  18. Cap Aruba and ffi to resolve version conflicts

    ffi has strict Ruby constraints
    
    aruba:
    
        Bundler could not find compatible versions for gem "thor":
          In Gemfile:
            aruba (~> 0.14.11) was resolved to 0.14.12, which depends on
              thor (~> 0.19)
    
            rails (~> 3.1.12) was resolved to 3.1.12, which depends on
              railties (= 3.1.12) was resolved to 3.1.12, which depends on
                thor (~> 0.14.6)
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    6e6a144 View commit details
    Browse the repository at this point in the history
  19. Use the previous aruba for older Rails

    https://github.com/rspec/rspec-rails/pull/2140/files#diff-73c25cf975ccb4c89d8659202506c353L58
    bumped aruba from 0.5.4 straight to 0.14.12. Using the version that used
    to work for older rails.
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    5781ea1 View commit details
    Browse the repository at this point in the history
  20. Add 5-2-stable Ruby 2.2 build to allowed failures

    There's a minor difference:
    
        Widget management
          User creates a new widget
    
        -1 example, 0 failures, 1 pending
        +1 example, 0 failures
    
    most probably caused by 5-2-stable vs 5.2.4.x spec generation
    difference.
    pirj committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    a8dd5e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. Clarify why a specific version of Aruba is used

    Co-authored-by: Jon Rowe <hello@jonrowe.co.uk>
    pirj and JonRowe committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    1dcff41 View commit details
    Browse the repository at this point in the history