Merge branch 'dev' of https://github.com/Flipper-XFW/Xtreme-Firmware into xfw-new-app-system

This commit is contained in:
Willy-JL
2023-11-12 07:43:13 +00:00
4 changed files with 49 additions and 49 deletions
+41 -41
View File
@@ -43,49 +43,49 @@ if __name__ == "__main__":
url = event["compare"]
color = 16723712 if event["forced"] else 3669797
case "pull_request":
pr = event["pull_request"]
url = pr["html_url"]
branch = pr["base"]["ref"] + (
""
if pr["base"]["repo"]["full_name"] != pr["head"]["repo"]["full_name"]
else f" <- {pr['head']['ref']}"
)
name = pr["title"][:50] + ("..." if len(pr["title"]) > 50 else "")
title = f"Pull Request {event['action'].title()} ({branch}): {name}"
match event["action"]:
case "opened":
desc = (pr["body"][:2045] + "...") if len(pr["body"]) > 2048 else pr["body"]
color = 3669797
# case "pull_request":
# pr = event["pull_request"]
# url = pr["html_url"]
# branch = pr["base"]["ref"] + (
# ""
# if pr["base"]["repo"]["full_name"] != pr["head"]["repo"]["full_name"]
# else f" <- {pr['head']['ref']}"
# )
# name = pr["title"][:50] + ("..." if len(pr["title"]) > 50 else "")
# title = f"Pull Request {event['action'].title()} ({branch}): {name}"
# match event["action"]:
# case "opened":
# desc = (pr["body"][:2045] + "...") if len(pr["body"]) > 2048 else pr["body"]
# color = 3669797
fields.append(
{
"name": "Changed Files:",
"value": str(pr["changed_files"]),
"inline": True,
}
)
fields.append(
{
"name": "Added:",
"value": "+" + str(pr["additions"]),
"inline": True,
}
)
fields.append(
{
"name": "Removed:",
"value": "-" + str(pr["deletions"]),
"inline": True,
}
)
# fields.append(
# {
# "name": "Changed Files:",
# "value": str(pr["changed_files"]),
# "inline": True,
# }
# )
# fields.append(
# {
# "name": "Added:",
# "value": "+" + str(pr["additions"]),
# "inline": True,
# }
# )
# fields.append(
# {
# "name": "Removed:",
# "value": "-" + str(pr["deletions"]),
# "inline": True,
# }
# )
case "closed":
color = 16723712
case "reopened":
color = 16751872
case _:
sys.exit(1)
# case "closed":
# color = 16723712
# case "reopened":
# color = 16751872
# case _:
# sys.exit(1)
case "release":
match event["action"]:
+2 -2
View File
@@ -2,8 +2,8 @@ name: 'SonarCloud'
on:
workflow_dispatch:
pull_request:
types: [opened, synchronize, reopened]
# pull_request:
# types: [opened, synchronize, reopened]
env:
TARGETS: f7
+5 -5
View File
@@ -2,11 +2,11 @@ name: 'Webhook'
on:
push:
pull_request:
types:
- "opened"
- "closed"
- "reopened"
# pull_request:
# types:
# - "opened"
# - "closed"
# - "reopened"
release:
types:
- "published"
+1 -1
View File
@@ -3060,7 +3060,7 @@ FRESULT find_volume ( /* FR_OK(0): successful, !=0: any error occurred */
fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */
} while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4);
}
if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */
if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */
if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
/* An FAT volume is found (bsect). Following code initializes the file system object */