Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Fix encoding spec from #6661 to also work 1.9.3 #6668

Merged
merged 1 commit into from
Aug 20, 2018

Conversation

eregon
Copy link
Contributor

@eregon eregon commented Aug 20, 2018

  • String#b is Ruby 2.0+.

What was the problem that led to this PR?

The CI is failing on the 1-16-stable branch.

What was your diagnosis of the problem?

The CI on master doesn't run against MRI 1.9.3, so this failure slipped in in #6661.
Probably testing against MRI 1.9.3 should be done on master too?

What is your fix for the problem, implemented in this PR?

Make the spec work on 1.9.3.

cc @hsbt

Copy link
Member

@deivid-rodriguez deivid-rodriguez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @eregon!

@deivid-rodriguez
Copy link
Member

Probably testing against MRI 1.9.3 should be done on master too?

Maybe... although one of the main points of "dropping" old ruby compatibility on master was build time, I think. So I tend to stick with my current opinion: drop 1.8.7 as well on master and delay compatibilty work to backporting PRs, instead of having to do it on every PR (that might not even be backported).

@eregon
Copy link
Contributor Author

eregon commented Aug 20, 2018

@deivid-rodriguez Both ways can work, but a mix is surprising.

I do see testing against older version makes backporting easier, instead of being a hard job and having highly diverging codebases.
Hopefully, Bundler 2.0 is soon and 1.x can be dropped ? :) (#6600)

@deivid-rodriguez
Copy link
Member

👍, to the three statements made :)

@eregon
Copy link
Contributor Author

eregon commented Aug 20, 2018

@deivid-rodriguez CI is green, could you trigger the merge? :)

@deivid-rodriguez
Copy link
Member

@bundlerbot r+

@bundlerbot
Copy link
Collaborator

📌 Commit f381a87 has been approved by deivid-rodriguez

@bundlerbot
Copy link
Collaborator

⌛ Testing commit f381a87 with merge 72f27b0...

@deivid-rodriguez deivid-rodriguez added this to the 1.16.4 milestone Aug 20, 2018
bundlerbot added a commit that referenced this pull request Aug 20, 2018
…driguez

Fix encoding spec from #6661 to also work 1.9.3

* String#b is Ruby 2.0+.

### What was the problem that led to this PR?

The CI is failing on the `1-16-stable` branch.

### What was your diagnosis of the problem?

The CI on master doesn't run against MRI 1.9.3, so this failure slipped in in #6661.
Probably testing against MRI 1.9.3 should be done on `master` too?

### What is your fix for the problem, implemented in this PR?

Make the spec work on 1.9.3.

cc @hsbt
@bundlerbot
Copy link
Collaborator

☀️ Test successful - status-travis
Approved by: deivid-rodriguez
Pushing 72f27b0 to master...

@bundlerbot bundlerbot merged commit f381a87 into rubygems:master Aug 20, 2018
colby-swandale pushed a commit that referenced this pull request Aug 20, 2018
…driguez

Fix encoding spec from #6661 to also work 1.9.3

* String#b is Ruby 2.0+.

### What was the problem that led to this PR?

The CI is failing on the `1-16-stable` branch.

### What was your diagnosis of the problem?

The CI on master doesn't run against MRI 1.9.3, so this failure slipped in in #6661.
Probably testing against MRI 1.9.3 should be done on `master` too?

### What is your fix for the problem, implemented in this PR?

Make the spec work on 1.9.3.

cc @hsbt

(cherry picked from commit 72f27b0)
colby-swandale added a commit that referenced this pull request Aug 22, 2018
* 1-16-stable:
  Version 1.16.4 with changelog
  Auto merge of #6668 - eregon:fix-encoding-spec-from-6661, r=deivid-rodriguez
  Add encoding magic comment to gemfile spec
  Auto merge of #6662 - bundler:indirect/update-authors, r=colby-swandale
  Auto merge of #6650 - greysteil:dont-mutate-original-trees, r=segiddins
  Auto merge of #6661 - eregon:consistent-encoding-for-reading-files, r=deivid-rodriguez
  Auto merge of #6652 - bundler:seg-molinillo-0.6.6, r=segiddins
  Auto merge of #6645 - bundler:colby/require-etc, r=colby-swandale
  Auto merge of #6636 - ojab:1-16-stable, r=indirect
  Auto merge of #6624 - bundler:no-document, r=colby-swandale
  Auto merge of #6621 - ralphbolo:patch-1, r=segiddins
  Auto merge of #6613 - kemitchell:mention-show-sorts-in-doc, r=colby-swandale
  Auto merge of #6570 - akihiro17:prerelease-dependency, r=segiddins
  Auto merge of #6568 - greysteil:conservative-groups, r=segiddins
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants