Merge pull request #40 from actions/fix-37

0899ea8 · Jonathan Clem · 2020-08-06 18:15

4 files +82 -24
Message
{commit_body(@commit)}

Files changed

modified .github/elixir.json
+27 −12
@@ -1,29 +1,44 @@
1 1 {
2 2 "problemMatcher": [
3 3 {
4 "owner": "elixir",
4 + "owner": "elixir-mixCompileError",
5 + "severity": "error",
5 6 "pattern": [
6 7 {
7 "regexp": "^(\\*\\* \\(.*\\) )?((.:)?[^:]*):(\\d+)(:(\\d+))?: (.*)$",
8 + "regexp": "^\\*\\* \\((\\w+)\\) (.*):(\\d+): (.*)$",
8 9 "file": 2,
9 "line": 4,
10 "column": 6,
11 "message": 7
10 + "line": 3,
11 + "message": 0
12 12 }
13 13 ]
14 14 },
15 15 {
16 "owner": "elixir-warning",
16 + "owner": "elixir-mixCompileWarning",
17 + "severity": "warning",
17 18 "pattern": [
18 19 {
19 "regexp": "^(warning: (.*))$",
20 "message": 2
20 + "regexp": "^warning: (.*)$",
21 + "message": 1
21 22 },
22 23 {
23 "regexp": "^( )((.:)?[^:]*):(\\d+)(:(\\d+))?$",
24 "file": 2,
25 "line": 4,
26 "column": 6
24 + "regexp": "^ (.*):(\\d+).*$",
25 + "file": 1,
26 + "line": 2
27 + }
28 + ]
29 + },
30 + {
31 + "owner": "elixir-mixTestFailure",
32 + "severity": "error",
33 + "pattern": [
34 + {
35 + "regexp": "^\\s*\\d+\\) (.*)$",
36 + "message": 1
37 + },
38 + {
39 + "regexp": "^\\s*(.*):(\\d+)$",
40 + "file": 1,
41 + "line": 2
27 42 }
28 43 ]
29 44 }
added MATCHER_NOTICE.md
+24 −0
@@ -0,0 +1,24 @@
1 +Problem matchers in [elixir.json](.github/elixir.json) are adapted from [here](https://github.com/fr1zle/vscode-elixir/blob/45eddb589acd7ac98e0c7305d1c2b24668ca709a/package.json#L70-L118),
2 +available under the [MIT license](https://github.com/fr1zle/vscode-elixir/blob/45eddb589acd7ac98e0c7305d1c2b24668ca709a/LICENSE.md):
3 +
4 +MIT License
5 +
6 +Copyright (c) 2016 Mathew McLoughlin
7 +
8 +Permission is hereby granted, free of charge, to any person obtaining a copy
9 +of this software and associated documentation files (the "Software"), to deal
10 +in the Software without restriction, including without limitation the rights
11 +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12 +copies of the Software, and to permit persons to whom the Software is
13 +furnished to do so, subject to the following conditions:
14 +
15 +The above copyright notice and this permission notice shall be included in all
16 +copies or substantial portions of the Software.
17 +
18 +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19 +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20 +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21 +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22 +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23 +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24 +SOFTWARE.
modified README.md
+4 −0
@@ -126,6 +126,10 @@ if System.get_env("GITHUB_ACTIONS") do
126 126 end
127 127 ```
128 128
129 +## Matchers
130 +
131 +The problem matchers in this repository are adapted from [here](https://github.com/fr1zle/vscode-elixir/blob/45eddb589acd7ac98e0c7305d1c2b24668ca709a/package.json#L70-L118). See [MATCHER_NOTICE](MATCHER_NOTICE.md) for license details.
132 +
129 133 ## License
130 134
131 135 The scripts and documentation in this project are released under the [MIT license](LICENSE.md).
modified dist/.github/elixir.json
+27 −12
@@ -1,29 +1,44 @@
1 1 {
2 2 "problemMatcher": [
3 3 {
4 "owner": "elixir",
4 + "owner": "elixir-mixCompileError",
5 + "severity": "error",
5 6 "pattern": [
6 7 {
7 "regexp": "^(\\*\\* \\(.*\\) )?((.:)?[^:]*):(\\d+)(:(\\d+))?: (.*)$",
8 + "regexp": "^\\*\\* \\((\\w+)\\) (.*):(\\d+): (.*)$",
8 9 "file": 2,
9 "line": 4,
10 "column": 6,
11 "message": 7
10 + "line": 3,
11 + "message": 0
12 12 }
13 13 ]
14 14 },
15 15 {
16 "owner": "elixir-warning",
16 + "owner": "elixir-mixCompileWarning",
17 + "severity": "warning",
17 18 "pattern": [
18 19 {
19 "regexp": "^(warning: (.*))$",
20 "message": 2
20 + "regexp": "^warning: (.*)$",
21 + "message": 1
21 22 },
22 23 {
23 "regexp": "^( )((.:)?[^:]*):(\\d+)(:(\\d+))?$",
24 "file": 2,
25 "line": 4,
26 "column": 6
24 + "regexp": "^ (.*):(\\d+).*$",
25 + "file": 1,
26 + "line": 2
27 + }
28 + ]
29 + },
30 + {
31 + "owner": "elixir-mixTestFailure",
32 + "severity": "error",
33 + "pattern": [
34 + {
35 + "regexp": "^\\s*\\d+\\) (.*)$",
36 + "message": 1
37 + },
38 + {
39 + "regexp": "^\\s*(.*):(\\d+)$",
40 + "file": 1,
41 + "line": 2
27 42 }
28 43 ]
29 44 }

Parents: 230dd25 7c582eb