From 674c4c1b9a3d19e43e13c63c627fa763ee77705e Mon Sep 17 00:00:00 2001
From: Jean-Michel Picod <jmichel@google.com>
Date: Wed, 29 Apr 2020 11:38:33 +0200
Subject: [PATCH] Fixing yapf matcher
---
.github/python_matcher.json | 13 ++++++++++---
deploy.py | 6 +++---
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.github/python_matcher.json b/.github/python_matcher.json
index d66fea8..2778f15 100644
--- a/.github/python_matcher.json
+++ b/.github/python_matcher.json
@@ -4,9 +4,16 @@
"owner": "yapf-diff",
"pattern": [
{
- "regexp": "^(?:---|\\+\\+\\+)\\s*([^\\s]*)\\s*\\((?:original|reformatted)\\)$",
- "file": 1,
- "message": "This file needs formating."
+ "regexp": "^---\\s*([^\\s]*)\\s*\\(original\\)$",
+ "file": 1
+ },
+ {
+ "regexp": "^\\+\\+\\+\\s*([^\\s]*)\\s*\\(reformatted\\)$",
+ "message": 2
+ },
+ {
+ "regexp": "^@@\\s*-(\\d+),(\\d+)\\s*\\+(\\d+),(\\d+)\\s*@@$",
+ "line": 1
}
]
},
diff --git a/deploy.py b/deploy.py
index c480656..16276ca 100755
--- a/deploy.py
+++ b/deploy.py
@@ -315,8 +315,7 @@ class OpenSKInstaller:
self.checked_command_output(["make"], cwd=props.path)
def build_example(self):
- info(
- "Building example {}".format(self.args.application))
+ info("Building example {}".format(self.args.application))
self._build_app_or_example(is_example=True)
def build_opensk(self):
@@ -343,7 +342,8 @@ class OpenSKInstaller:
env["RUSTFLAGS"] = " ".join(rust_flags)
command = [
- "cargo", "build", "--release", "--target={}".format(props.arch),
+ "cargo",
+ "build", "--release", "--target={}".format(props.arch),
"--features={}".format(",".join(self.args.features))
]
if is_example:
--
GitLab