Arfon Smith
202cba1a14
Update CONTRIBUTING.md
2014-12-31 11:38:03 -06:00
Arfon Smith
4c7dc565e7
Update including explicit steps to resolve conflicts.
2014-12-30 20:52:48 -06:00
Adam Roben
3c60fba430
Merge pull request #1926 from github/sas-grammar
...
Added support for SAS syntax.
2014-12-30 07:26:32 -05:00
Roy Pardee
224eef9ffa
Added support for SAS syntax.
2014-12-30 06:34:37 -05:00
Brandon Keepers
80ed2d6d30
Merge pull request #1920 from pchaigno/webidl-grammar
...
Grammar for WebIDL
2014-12-27 14:55:47 -05:00
Paul Chaignon
c2bf6fe7f5
Grammar for WebIDL
2014-12-27 16:54:41 +01:00
Adam Roben
6f014f8638
Merge pull request #1896 from github/grammar-submodules
...
Move all grammars that use Git repos to submodules
2014-12-22 17:17:40 -05:00
Adam Roben
66ca5aca89
Init submodules in CI
2014-12-22 17:07:37 -05:00
Adam Roben
33afa30c30
Don't use question marks in struct fields
...
Apparently it doesn't work in Ruby 1.9.
2014-12-22 17:06:49 -05:00
Adam Roben
1634d787ec
Use fast-submodule-update in CI
...
Hopefully this will speed up CI builds.
2014-12-22 16:58:59 -05:00
Adam Roben
df7b529e23
Set tracking branches for submodules that aren't tracking master
...
This will let us use `git submodule update --remote` to update the
submodules to the latest commit from the relevant branch.
2014-12-22 16:41:22 -05:00
Adam Roben
56d90bedd0
Sort grammars.yml
2014-12-22 16:36:35 -05:00
Brandon Keepers
8369d253f8
Move grammar sources to vendor/grammars
2014-12-22 16:28:58 -05:00
Adam Roben
516d3e226c
Suggest adding/removing submodules from the repo
2014-12-22 15:50:33 -05:00
Adam Roben
47b785a8fd
Initialize submodules before updating them
...
Initialization cannot happen in parallel because every submodule has to
get written to .git/config.
2014-12-19 16:05:17 -05:00
Adam Roben
6a2bf3fd2f
Update submodules in parallel to speed up bootstrap
...
This runs 8 `git submodule update` processes in parallel, speeding up
bootstrap from 2 minutes to 30 seconds for me. (Obviously this is
dependent on bandwidth.)
2014-12-19 16:05:17 -05:00
Adam Roben
ff678642e6
Suggest running script/bootstrap before building gems
...
This ensures all our submodules are up to date as well.
2014-12-19 16:05:17 -05:00
Adam Roben
e3eb1b90c5
Test that grammars.yml agrees with the list of submodules
...
If any submodules are missing from grammars.yml, or are listed in
grammars.yml but missing from the repo, the test will fail.
Eventually it would be good to test that the scopes for each submodule
are accurate, but that will take some more work.
2014-12-19 16:05:17 -05:00
Adam Roben
49125f077c
Update grammars.yml
...
This is just the result of running script/download-grammars.
2014-12-19 15:39:02 -05:00
Adam Roben
324031cb68
Sort grammars.yml
2014-12-19 15:39:02 -05:00
Adam Roben
f2ab426d38
Move all grammars that use Git repos to submodules
...
This makes it so we don't have to redownload all the grammars every time
we build the grammars gem. It will also let us verify that grammars.yml
is accurate in the future by checking it against the submodules on disk.
script/bootstrap now updates the submodules.
2014-12-19 15:39:02 -05:00
Brandon Keepers
587ab35d65
Merge pull request #1904 from github/remove-cached-gems
...
Remove cached gems
2014-12-19 11:27:10 -05:00
Brandon Keepers
16a6dda3dd
Remove cached gems
2014-12-19 10:52:29 -05:00
Arfon Smith
15191b068d
Merge pull request #1890 from github/cut-release-v4.2.4
...
Updating Linguist version for v4.2.4
2014-12-18 14:31:21 -08:00
Arfon Smith
ee9cc24e52
Longer timeout
2014-12-18 14:28:33 -08:00
Arfon Smith
0584fbf42b
4.2.5
2014-12-18 14:17:36 -08:00
Adam Roben
f5f9ccee7f
Merge pull request #1895 from github/bootstrap-script
...
Add script/bootstrap
2014-12-18 12:20:26 -05:00
Adam Roben
0d183e2e89
Ignore vendor/gems
...
This is where script/bootstrap places the bundle.
2014-12-18 12:14:45 -05:00
Adam Roben
b9eacfefc8
Add script/bootstrap
...
This just runs Bundler with the right options. Maybe it will do more in
the future, like update submodules.
2014-12-18 12:13:32 -05:00
Arfon Smith
0239127db4
4.2.5b1
2014-12-18 08:02:24 -08:00
Arfon Smith
281d1ea91c
Merge branch 'master' into cut-release-v4.2.4
2014-12-17 15:37:46 -08:00
Arfon Smith
df92ecaa55
Merge pull request #1891 from github/fix-grammars
...
Fix some bugs in grammars.yml
2014-12-17 15:35:30 -08:00
Adam Roben
60d40c8ad8
Update grammars.yml
...
I just ran script/download-grammars and these are the changes it made.
The most notable one is that we had the wrong scope listed for Markdown.
2014-12-17 16:39:03 -05:00
Adam Roben
f428c561c9
Remove the WebIDL grammar
...
This grammar uses the same scope name (source.idl) as our existing IDL
grammar. The wrong scope name was listed in grammars.yml which masked
this problem. https://github.com/andik/IDL-Syntax/pull/2 tracks getting
the grammar to use a different scope name; in the meantime we just won't
highlight these files.
2014-12-17 16:39:03 -05:00
Adam Roben
8fbb7a1d93
Sort grammars.yml
2014-12-17 16:39:03 -05:00
Adam Roben
e98223b2b3
Use raw links as little as possible
...
It's much cleaner and more robust to specify the repo URL instead of a
URL to an individual file. If the file gets moved we'll still be able to
find it if we're using the repo URL.
Where we do need raw links, we now use github.com/owner/repo/raw/*
because it looks a bit nicer and sorts better with non-raw links.
2014-12-17 16:39:03 -05:00
Adam Roben
410fe2843d
Add some tests for grammars.yml
...
It must be sorted, because it will get re-sorted when
script/download-grammars is next run and that would clutter up diffs.
And it must not contain any duplicate scopes.
2014-12-17 16:39:02 -05:00
Arfon Smith
dc8d69e0f4
Updating Linguist version for v4.2.4
2014-12-17 10:31:51 -08:00
Arfon Smith
a056765e38
Merge pull request #1886 from Dadido3/patch-1
...
Add PureBasic
2014-12-17 10:28:46 -08:00
Adam Roben
4e7da98bfa
Merge pull request #1875 from arctic5/patch-1
...
change ace mode of game maker language to c++
2014-12-17 08:59:21 -05:00
David Vogel
0a56f5282d
Create Example_Sine.pb
2014-12-17 12:00:16 +01:00
Arfon Smith
04b9ca2fd4
Merge pull request #1797 from github/cs-smalltalk
...
Cs smalltalk
2014-12-17 04:47:37 -06:00
Arfon Smith
ddbe3df6de
Merge pull request #1876 from Mailaender/patch-2
...
Added support for StyleCop XML configuration files
2014-12-16 21:29:55 -06:00
Arfon Smith
ab5c88a7f3
Merge pull request #1881 from hawkw/master
...
Add support for Jasmin JVM assembly
2014-12-16 21:29:19 -06:00
Arfon Smith
4046a0efe9
Merge pull request #1877 from sebgod/change-mercury-grammar
...
Added a more suitable grammar for Mercury
2014-12-16 21:27:10 -06:00
Arfon Smith
5aefc7cdff
Merge pull request #1885 from github/gjtorikian-patch-1
...
Use atom/language-atom for the YAML grammar
2014-12-16 21:25:02 -06:00
David Vogel
70eb779ce5
Reduced PureBasic to .pb and .pbi
2014-12-16 22:19:56 +01:00
David Vogel
39f5d28348
Added PureBasic example
2014-12-16 21:12:13 +01:00
David Vogel
e70407f16b
Added PureBasic
2014-12-16 20:34:32 +01:00
Garen Torikian
c25475296d
Use atom/language-atom for the YAML grammar
2014-12-16 08:17:07 -08:00
