Fixing yapf matcher

This commit is contained in:
Jean-Michel Picod
2020-04-29 11:38:33 +02:00
parent 2e35d0074a
commit 674c4c1b9a
2 changed files with 13 additions and 6 deletions

View File

@@ -4,9 +4,16 @@
"owner": "yapf-diff", "owner": "yapf-diff",
"pattern": [ "pattern": [
{ {
"regexp": "^(?:---|\\+\\+\\+)\\s*([^\\s]*)\\s*\\((?:original|reformatted)\\)$", "regexp": "^---\\s*([^\\s]*)\\s*\\(original\\)$",
"file": 1, "file": 1
"message": "This file needs formating." },
{
"regexp": "^\\+\\+\\+\\s*([^\\s]*)\\s*\\(reformatted\\)$",
"message": 2
},
{
"regexp": "^@@\\s*-(\\d+),(\\d+)\\s*\\+(\\d+),(\\d+)\\s*@@$",
"line": 1
} }
] ]
}, },

View File

@@ -315,8 +315,7 @@ class OpenSKInstaller:
self.checked_command_output(["make"], cwd=props.path) self.checked_command_output(["make"], cwd=props.path)
def build_example(self): def build_example(self):
info( info("Building example {}".format(self.args.application))
"Building example {}".format(self.args.application))
self._build_app_or_example(is_example=True) self._build_app_or_example(is_example=True)
def build_opensk(self): def build_opensk(self):
@@ -343,7 +342,8 @@ class OpenSKInstaller:
env["RUSTFLAGS"] = " ".join(rust_flags) env["RUSTFLAGS"] = " ".join(rust_flags)
command = [ command = [
"cargo", "build", "--release", "--target={}".format(props.arch), "cargo",
"build", "--release", "--target={}".format(props.arch),
"--features={}".format(",".join(self.args.features)) "--features={}".format(",".join(self.args.features))
] ]
if is_example: if is_example: