summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Consistenly use the default RSpec formatternormalize_rspec_formatterDavid Rodríguez2019-09-234-4/+2
|
* Merge #7296Bundlerbot2019-09-2221-131/+175
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7296: Improve exec'ing to the proper rubygems version r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that the `with_rubygems` script is hard to work with, because it does complicated ARGV manipulation before exec'ing. ### What was your diagnosis of the problem? My diagnosis was that we don't need it. ### What is your fix for the problem, implemented in this PR? My fix is to implement the same thing in a simpler way. ### Why did you choose this fix out of the possible options? I chose this fix because it simplifies things. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Remove no longer needed rubygems updateremove_with_rubygemsDavid Rodríguez2019-09-191-3/+0
| | | | | | | | We never use system rubygems anymore. Always the local clone.
| * Always go through our `rake` binstub in TravisCIDavid Rodríguez2019-09-191-5/+6
| |
| * Only change cloned copy version if necessaryDavid Rodríguez2019-09-191-2/+15
| | | | | | | | This should make binstubs more responsive when using `ENV["RGV"]`.
| * Replace `with_rubygems` scriptDavid Rodríguez2019-09-1914-121/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, use a better rubygems version manager that makes sure that `ENV["RGV"]` usage is always applied, and its usage is centralized at a single place. This simplifies the rake task organization and makes it much simpler to run locally exactly what's run in CI. For example, since it doesn't rely on the `RGV` being deleted for subsequent subprocesses, it also running `bin/rake spec:travis` task locally which previously would lead to ``` rake aborted! RubyGems version is required on Travis! ``` It also reduces duplication making it so that we only need to change the `.travis.yml` file when updating tested rubies, and not the `Rakefile` as well.
| * Move some global requires to their few usagesDavid Rodríguez2019-09-187-3/+11
| |
| * Reuse existing helperDavid Rodríguez2019-09-171-6/+8
| | | | | | | | | | So that we don't include a `run` method at the top level, which can conflict with other `run` methods our specs use.
| * Consistenly pass strings to `run` helperDavid Rodríguez2019-09-171-5/+5
| |
| * Move require to the only file that needs itDavid Rodríguez2019-09-172-1/+2
| |
| * Explicitly require test helpersDavid Rodríguez2019-09-171-4/+15
| | | | | | | | We don't need to keep adding exceptions.
| * Remove duplicated conditionDavid Rodríguez2019-09-171-1/+1
|/ | | | We're checking the same thing in the previous line
* Merge #7358Bundlerbot2019-09-172-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7358: More release fixes r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? I just released [2.1.0.pre.2](https://rubygems.org/gems/bundler/versions/2.1.0.pre.2). It went smoother than 2.1.0.pre.1, but I still got an issue where I unintentionally pushed a release named "v" to github releases. ### What was your diagnosis of the problem? My diagnosis was that the release task by default should use the version in the gemspec for the `release:github` tasks. ### What is your fix for the problem, implemented in this PR? My fix adds that fallback. ### Why did you choose this fix out of the possible options? I chose this fix because it does what the user expects when the task is not passed any arguments. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Add missing changelog datemore_release_fixesDavid Rodríguez2019-09-151-1/+1
| |
| * Fallback to `release:github` task when no version specifiedDavid Rodríguez2019-09-151-1/+1
| |
* | Merge #7359Bundlerbot2019-09-1715-97/+79
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | 7359: Spec simplifications r=indirect a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that while working on #7296 and investigating why CI was failing there, I ended up adding several simplifications that are not necessarily related to that PR. In order to make that PR more digestable, I extracted those simplifications and improvements to this separate PR. ### Why did you choose this fix out of the possible options? I chose this fix because it makes our dev and test environment better and simpler with some little tweaks. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Rename requirement_checker to filtersspec_simplificationsDavid Rodríguez2019-09-153-41/+45
| | | | | | | | And move filter configuration there.
| * Migrate a couple of requires to be relativeDavid Rodríguez2019-09-152-2/+3
| |
| * Remove unneded require and inclusionDavid Rodríguez2019-09-151-2/+0
| |
| * Remove dead codeDavid Rodríguez2019-09-151-4/+0
| |
| * Fail hard if activating dep deps failsDavid Rodríguez2019-09-151-1/+1
| |
| * Fix warning when overriding versionDavid Rodríguez2019-09-151-1/+1
| |
| * Remove unneeded travis_retryDavid Rodríguez2019-09-151-1/+1
| | | | | | | | No network here.
| * Remove unnecessary outputDavid Rodríguez2019-09-151-1/+0
| |
| * Add some debugging info to error messageDavid Rodríguez2019-09-151-1/+1
| |
| * Extract helper methodDavid Rodríguez2019-09-151-4/+8
| |
| * Use '--progress' RSpec format by defaultDavid Rodríguez2019-09-151-1/+1
| |
| * Remove unneeeded inclusionDavid Rodríguez2019-09-151-2/+0
| |
| * Remove unneeded requiresDavid Rodríguez2019-09-151-3/+0
| |
| * Lazily require rubygems/user_interactionDavid Rodríguez2019-09-151-1/+1
| |
| * Refactor activation errorsDavid Rodríguez2019-09-156-25/+7
| |
| * Add a private sectionDavid Rodríguez2019-09-151-5/+7
| |
| * This module is special and not used inside specsDavid Rodríguez2019-09-151-1/+0
| |
| * Use `extend self`David Rodríguez2019-09-151-6/+8
|/ | | | Instead of repeating `self` on every method.
* Merge #7355Bundlerbot2019-09-152-14/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7355: Restore version bumping to `release:prepare_patch` r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I removed too much code in #7350. ### What was your diagnosis of the problem? My diagnosis was that since I removed the auto-bumping `version.rb`, the task no longer works before it tries to cherry-pick changes for the _current_, not the _to be released_ version, so I fails because it finds no open PR for that milestone (because it's already been released). ### What is your fix for the problem, implemented in this PR? My fix is to restore the code that automatically bumps the version to the next patch level version, and commits that to the release branch. ### Why did you choose this fix out of the possible options? I chose this fix because it works for me. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Document the modified `release:prepare_patch` taskfix_release_task_againDavid Rodríguez2019-09-121-11/+18
| |
| * Restore version bumping to `release:prepare_patch`David Rodríguez2019-09-121-3/+23
|/
* Merge #7350Bundlerbot2019-09-121-38/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7350: Simplify `release:patch` task r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I'm using a slightly different workflow for releasing, but the current rake task does not work my way. ### What was your diagnosis of the problem? My diagnosis was that previously the release task would push the changelog directly to the release branch and master. The way I'm doing it, I open a regular PR which can be reviewed and merged through bundlerbot just like any other PR. ### What is your fix for the problem, implemented in this PR? My fix is to adapt the task to the workflow I'm using, and change it to only cherry-pick all the milestoned changes to the stable branch. I renamed it to `release:prepare_patch`. ### Why did you choose this fix out of the possible options? I chose this fix because it allows the release process itself to be reviewed, and it would allow us to protect the master and stable branches if we wanted to. It also allows to make sure that CI is passing on the stable branch with all changes cherry-picked, before actually releasing. This could avoid, for example, bugs from being introduced from conflict-resolution errors while cherry-picking changes. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Add some loggingfix_release_patch_taskDavid Rodríguez2019-09-101-0/+2
| |
| * This task is no longer "destructive"David Rodríguez2019-09-101-2/+0
| | | | | | | | | | It no longer releases, not touches protected remote branches, so no really need for confirmation.
| * Cherry-pick commits into a new branchDavid Rodríguez2019-09-101-1/+1
| | | | | | | | So we can create a release PR to the stable branch.
| * Simplify `release:patch` taskDavid Rodríguez2019-09-101-37/+4
| |
* | Merge #7353Bundlerbot2019-09-113-3/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7353: require `rubygems`, not `ubygems` in example r=hsbt a=crazymykl The latter does not work on Ruby 2.6.3. Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. ### What was the end-user problem that led to this PR? The problem was a broken example in the docs. ### What was your diagnosis of the problem? Ibid. ### What is your fix for the problem, implemented in this PR? My fix was to write what was likely intended. ### Why did you choose this fix out of the possible options? I chose this fix because the solution space is pretty small. Co-authored-by: Mike MacDonald <crazymykl@gmail.com>
| * require `rubygems`, not `ubygems`Mike MacDonald2019-09-113-3/+3
|/ | | | The latter does not work on Ruby 2.6.3.
* Merge #7343Bundlerbot2019-09-091-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 7343: Add 2.1.0.pre.2 changelog entries r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that the changelog needs to be filled before releasing the next pre. ### What is your fix for the problem, implemented in this PR? My fix is to fill in the user facing changes that I plan to include. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Add 2.1.0.pre.2 changelog entries2.1.0.pre.2_changelogDavid Rodríguez2019-09-051-0/+7
| |
* | Merge #7342Bundlerbot2019-09-092-20/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7342: Start using automatiek 0.3.0 r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I added a feature to automatiek to vendor subdependencies, but we were not using it because it had not yet been released. ### What is your fix for the problem, implemented in this PR? My fix is to start using the feature now that it has been released. ### Why did you choose this fix out of the possible options? I chose this fix because it allows us to manage the `net-http-persistent` dependency in an easier way. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Start using automatiek 0.3.0automatiek_0.3David Rodríguez2019-09-042-20/+10
| | |
* | | Merge #7344Bundlerbot2019-09-054-3/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7344: Backport the latest ruby core changes r=hsbt a=hsbt ### What was the end-user problem that led to this PR? The master branch of Bundler with Ruby 2.7 fails some of tests. ### What was your diagnosis of the problem? It caused by deprecation warnings of Ruby 2.7 and some environmental issues. ### What is your fix for the problem, implemented in this PR? I fixed them. * rspec examples of Bundler failed randomly on GitHub Actions of ruby/ruby. We fixed it on `spec_group.rb` * `github_action_linux` label is no longer required. The current test suite is all green status with GitHub Actions. * The keyword separation feature warns stub code under the `inline_spec.rb`. I ignore them. ### Why did you choose this fix out of the possible options? Co-authored-by: Hiroshi SHIBATA <hsbt@ruby-lang.org> Co-authored-by: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
| * | Ignore the all of warnings with inline_spec.rb of bundler examples.backport-ruby-coreHiroshi SHIBATA2019-09-051-1/+1
| | |
View Lorry Controller Status