Release v6.1.0 (#4109)

* Update release process * Remove old unused scala entry This was missed in #4044 * Update grammars * Bump to v6.1.0
github-linguist · Apr 24, 2018 · f9c00de · f9c00de
1 parent 14a7cb2
commit f9c00de
Show file tree

Hide file tree

Showing 52 changed files with 54 additions and 60 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -748,9 +748,6 @@
 [submodule "vendor/grammars/sass-textmate-bundle"]
 	path = vendor/grammars/sass-textmate-bundle
 	url = https://github.com/nathos/sass-textmate-bundle
-[submodule "vendor/grammars/scala.tmbundle"]
-	path = vendor/grammars/scala.tmbundle
-	url = https://github.com/mads379/scala.tmbundle
 [submodule "vendor/grammars/scheme.tmbundle"]
 	path = vendor/grammars/scheme.tmbundle
 	url = https://github.com/textmate/scheme.tmbundle

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -125,7 +125,6 @@ Linguist is maintained with :heart: by:
 - **@Alhadis**
 - **@BenEddy** (GitHub staff)
 - **@Caged** (GitHub staff)
-- **@grantr** (GitHub staff)
 - **@kivikakk** (GitHub staff)
 - **@larsbrinkhoff**
 - **@lildude** (GitHub staff)
@@ -142,18 +141,19 @@ As Linguist is a production dependency for GitHub we have a couple of workflow r
 
 If you are the current maintainer of this gem:
 
-1. Create a branch for the release: `git checkout -b cut-release-vxx.xx.xx`
+1. Create a branch for the release: `git checkout -b release-vxx.xx.xx`
 1. Make sure your local dependencies are up to date: `script/bootstrap`
 1. If grammar submodules have not been updated recently, update them: `git submodule update --remote && git commit -a`
 1. Ensure that samples are updated: `bundle exec rake samples`
 1. Ensure that tests are green: `bundle exec rake test`
-1. Bump gem version in `lib/linguist/version.rb`, [like this](https://github.com/github/linguist/commit/8d2ea90a5ba3b2fe6e1508b7155aa4632eea2985).
-1. Make a PR to github/linguist, [like this](https://github.com/github/linguist/pull/1238).
-1. Build a local gem: `bundle exec rake build_gem`
-1. Test the gem:
+1. Build a test gem `GEM_VERSION=$(git describe --tags 2>/dev/null | sed 's/-/./g' | sed 's/v//') bundle exec rake build_gem`
+1. Test the test gem:
   1. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
   1. Install the new gem locally
   1. Test behavior locally, branch deploy, whatever needs to happen
+1. Bump gem version in `lib/linguist/version.rb`, [like this](https://github.com/github/linguist/commit/8d2ea90a5ba3b2fe6e1508b7155aa4632eea2985).
+1. Make a PR to github/linguist, [like this](https://github.com/github/linguist/pull/1238).
+1. Build a local gem: `bundle exec rake build_gem`
 1. Merge github/linguist PR
 1. Tag and push: `git tag vx.xx.xx; git push --tags`
 1. Create a GitHub release with the pushed tag (https://github.com/github/linguist/releases/new)

diff --git a/grammars.yml b/grammars.yml
@@ -621,8 +621,6 @@ vendor/grammars/sas.tmbundle:
 - source.sas
 vendor/grammars/sass-textmate-bundle:
 - source.sass
-vendor/grammars/scala.tmbundle:
-- source.sbt
 vendor/grammars/scheme.tmbundle:
 - source.scheme
 vendor/grammars/scilab.tmbundle:

diff --git a/lib/linguist/version.rb b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "6.0.1"
+  VERSION = "6.1.0"
 end
diff --git a/vendor/CodeMirror b/vendor/CodeMirror
diff --git a/vendor/grammars/Isabelle.tmbundle b/vendor/grammars/Isabelle.tmbundle
diff --git a/vendor/grammars/SublimeClarion b/vendor/grammars/SublimeClarion
diff --git a/vendor/grammars/SublimeEthereum b/vendor/grammars/SublimeEthereum
diff --git a/vendor/grammars/Terraform.tmLanguage b/vendor/grammars/Terraform.tmLanguage
diff --git a/vendor/grammars/TypeScript-TmLanguage b/vendor/grammars/TypeScript-TmLanguage
diff --git a/vendor/grammars/antlr.tmbundle b/vendor/grammars/antlr.tmbundle
diff --git a/vendor/grammars/atom-language-julia b/vendor/grammars/atom-language-julia
diff --git a/vendor/grammars/atom-language-nextflow b/vendor/grammars/atom-language-nextflow
diff --git a/vendor/grammars/c.tmbundle b/vendor/grammars/c.tmbundle
diff --git a/vendor/grammars/creole b/vendor/grammars/creole
diff --git a/vendor/grammars/d.tmbundle b/vendor/grammars/d.tmbundle
diff --git a/vendor/grammars/elixir-tmbundle b/vendor/grammars/elixir-tmbundle
diff --git a/vendor/grammars/fortran.tmbundle b/vendor/grammars/fortran.tmbundle
diff --git a/vendor/grammars/gdscript b/vendor/grammars/gdscript
diff --git a/vendor/grammars/haxe-TmLanguage b/vendor/grammars/haxe-TmLanguage
diff --git a/vendor/grammars/language-ballerina b/vendor/grammars/language-ballerina
diff --git a/vendor/grammars/language-batchfile b/vendor/grammars/language-batchfile
diff --git a/vendor/grammars/language-blade b/vendor/grammars/language-blade
diff --git a/vendor/grammars/language-crystal b/vendor/grammars/language-crystal
diff --git a/vendor/grammars/language-csharp b/vendor/grammars/language-csharp
diff --git a/vendor/grammars/language-csound b/vendor/grammars/language-csound
diff --git a/vendor/grammars/language-graphql b/vendor/grammars/language-graphql
diff --git a/vendor/grammars/language-haml b/vendor/grammars/language-haml
diff --git a/vendor/grammars/language-haskell b/vendor/grammars/language-haskell
diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript
diff --git a/vendor/grammars/language-meson b/vendor/grammars/language-meson
diff --git a/vendor/grammars/language-renpy b/vendor/grammars/language-renpy
diff --git a/vendor/grammars/language-restructuredtext b/vendor/grammars/language-restructuredtext
diff --git a/vendor/grammars/language-rpm-spec b/vendor/grammars/language-rpm-spec
diff --git a/vendor/grammars/language-shellscript b/vendor/grammars/language-shellscript
diff --git a/vendor/grammars/language-typelanguage b/vendor/grammars/language-typelanguage
diff --git a/vendor/grammars/language-viml b/vendor/grammars/language-viml
diff --git a/vendor/grammars/language-yaml b/vendor/grammars/language-yaml
diff --git a/vendor/grammars/language-yara b/vendor/grammars/language-yara
diff --git a/vendor/grammars/latex.tmbundle b/vendor/grammars/latex.tmbundle
diff --git a/vendor/grammars/mathematica-tmbundle b/vendor/grammars/mathematica-tmbundle
diff --git a/vendor/grammars/pawn-sublime-language b/vendor/grammars/pawn-sublime-language
diff --git a/vendor/grammars/perl.tmbundle b/vendor/grammars/perl.tmbundle
diff --git a/vendor/grammars/php-smarty.tmbundle b/vendor/grammars/php-smarty.tmbundle
diff --git a/vendor/grammars/php.tmbundle b/vendor/grammars/php.tmbundle
diff --git a/vendor/grammars/sas.tmbundle b/vendor/grammars/sas.tmbundle
diff --git a/vendor/grammars/scala.tmbundle b/vendor/grammars/scala.tmbundle
diff --git a/vendor/grammars/sublime-MuPAD b/vendor/grammars/sublime-MuPAD
diff --git a/vendor/grammars/sublime-angelscript b/vendor/grammars/sublime-angelscript
diff --git a/vendor/grammars/swift.tmbundle b/vendor/grammars/swift.tmbundle
diff --git a/vendor/grammars/vscode-scala-syntax b/vendor/grammars/vscode-scala-syntax
diff --git a/vendor/grammars/vue-syntax-highlight b/vendor/grammars/vue-syntax-highlight