Merge pull request 'action-create-pr: fix $@ not forwarded' (#70) from DavHau-main into main
All checks were successful
build / test (push) Successful in 7s

This commit is contained in:
clan-bot 2023-08-07 08:41:29 +00:00
commit 7bc36ba29e
3 changed files with 21 additions and 14 deletions

View File

@ -16,9 +16,18 @@
script = ''
while sleep 10; do
${self.packages.${pkgs.system}.clan-merge}/bin/clan-merge \
--allowed-users clan-bot DavHau lassulus Mic92 \
--repos clan-infra clan-core clan-homepage \
--bot-name clan-bot
--bot-name clan-bot \
--allowed-users \
clan-bot \
hsjobeki \
DavHau \
lassulus \
Mic92 \
Qubasa \
--repos\
clan-infra \
clan-core \
clan-homepage
done
'';
};

View File

@ -6,5 +6,5 @@
, writePureShellScriptBin
}:
writePureShellScriptBin "action-create-pr" [ bash coreutils git tea openssh ] ''
bash ${./script.sh}
bash ${./script.sh} "$@"
''

View File

@ -12,8 +12,12 @@ def load_token() -> str:
return f.read().strip()
def pr_message(pr: dict) -> str:
return f"PR {pr['number']} in repo {pr['base']['repo']['name']} from user {pr['user']['login']}: {pr['title']}"
def is_ci_green(pr: dict) -> bool:
print("Checking CI status for PR " + str(pr["id"]))
print(f"Checking CI status for {pr_message(pr)}")
repo = pr["base"]["repo"]["name"]
url = (
"https://git.clan.lol/api/v1/repos/clan/"
@ -26,9 +30,7 @@ def is_ci_green(pr: dict) -> bool:
data = json.loads(response.read())
# check for all commit statuses to have status "success"
if not data["statuses"]:
print(
f"No CI status for PR {pr['number']} in repo {repo} from user {pr['user']['login']}"
)
print(f"No CI status for {pr_message(pr)}")
return False
for status in data["statuses"]:
if status["status"] != "success":
@ -122,13 +124,9 @@ def clan_merge(
+ f"?token={gitea_token}"
)
if dry_run is True:
print(
f"Would merge PR {pr['number']} in repo {repo} from user {pr['user']['login']}"
)
print(f"Would merge {pr_message(pr)}")
else:
print(
f"Merging PR {pr['number']} in repo {repo} from user {pr['user']['login']}"
)
print(f"Merging {pr_message(pr)}")
data = dict(
Do="merge",
)