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

Release v5.0.5 #3473

Merged
merged 8 commits into from
Feb 15, 2017
Merged

Release v5.0.5 #3473

merged 8 commits into from
Feb 15, 2017

Conversation

lildude
Copy link
Member

@lildude lildude commented Feb 14, 2017

Quite a few changes: v5.0.4...lildude:cut-release-v5.0.5

With this release I've also updated the grammars and relaxed the rugged dependency as we're using 0.26.0b3 on dotcom and we probably shouldn't be shipping a release of Linguist that depends on a beta version of rugged.

@brandonblack as this is my first release, I'm asking for your review of this PR before I go ahead and merge, push etc, just to be safe.

Local testing with dotcom doesn't reveal any problems.

@brndnblck
Copy link

brndnblck commented Feb 15, 2017

@lildude looks good overall, but we need to test the grammar updates in dotcom. I had some trouble with PHP in particular last time and had to roll back to the previous version.

I've built the gem locally from this branch and opened a PR against dotcom for this.

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.add_dependency 'charlock_holmes', '~> 0.7.3'
s.add_dependency 'escape_utils', '~> 1.1.0'
s.add_dependency 'mime-types', '>= 1.19'
s.add_dependency 'rugged', '0.26.0b3'

Choose a reason for hiding this comment

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

Loosening this version is fine provided it remains compatible with dotcom (this was a problem in previous releases).

However, can you confirm your branch here is build from the latest? We actually bumped this a while ago and it looks like you were building off something old here.

https://github.com/github/linguist/blob/master/github-linguist.gemspec#L19

Copy link
Member Author

Choose a reason for hiding this comment

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

The loosening from 0.2.6.0b3 was just me reversing the bump I did in 0b9eb0c (in this PR) and instead opting for a loosening of the version. The overall change in this PR is from = 0.25.1.1 to >= 0.25.1.1.

Copy link

@brndnblck brndnblck left a comment

Choose a reason for hiding this comment

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

There's a problem with the php.tmbundle grammar update. If you cherry-pick this commit into your release branch here we can ship without that update and deal with it separately.

Brandon Black and others added 3 commits February 15, 2017 09:25
@lildude
Copy link
Member Author

lildude commented Feb 15, 2017

All sorted with no changes to the php.tmbundle submodule. Gonna merge and 🚢.

@lildude lildude merged commit 10457b6 into github-linguist:master Feb 15, 2017
@lildude lildude deleted the cut-release-v5.0.5 branch February 15, 2017 11:12
@lildude lildude restored the cut-release-v5.0.5 branch February 15, 2017 11:13
@lildude lildude deleted the cut-release-v5.0.5 branch February 15, 2017 11:15
alexlouden added a commit to alexlouden/linguist that referenced this pull request Feb 16, 2017
* 'master' of github.com:github/linguist:
  Release v5.0.5 -- part Deux (github-linguist#3479)
  Update LICENSE
  Update LICENSE Copyright Date to 2017 (github-linguist#3476)
  Revert "Release v5.0.5" (github-linguist#3477)
  Release v5.0.5 (github-linguist#3473)
  Return early in Classifier.classify if no languages supplied (github-linguist#3471)
  Fix head commit for TXL grammar (github-linguist#3470)
@github-linguist github-linguist locked as resolved and limited conversation to collaborators Jun 17, 2024
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.

2 participants