Skip to content

Commit

Permalink
Merge branch '5.2-dev' into 5.2/upmerge/2024-04-25
Browse files Browse the repository at this point in the history
  • Loading branch information
Quy authored Apr 25, 2024
2 parents d04cce5 + cb48b8b commit d487cfd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions build/github_rebase.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@
$baseBranches = $argi[1];
break;
case '--target':
$targetBranch = $argi[1];
$targetBranch = $argi[1];
break;
case '--pr':
$prNumber = $argi[1];
$prNumber = $argi[1];
break;
case '--label':
$label = $argi[1];
$label = $argi[1];
break;
case '--reason':
$additionalReason = $argi[1];
$additionalReason = $argi[1];
break;
default:
die('Unknown option: ' . $argi[0]);
Expand Down Expand Up @@ -160,7 +160,7 @@

$list = json_decode($json, true);

echo "\nFound " . count($list) . " pull request(s).\n";
echo "\nFound " . \count($list) . " pull request(s).\n";

foreach ($list as $pr) {
echo "Rebase #" . $pr['number'] . "\n";
Expand Down
8 changes: 4 additions & 4 deletions build/github_update_title.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
$baseBranches = $argi[1];
break;
case '--pr':
$prNumber = $argi[1];
$prNumber = $argi[1];
break;
case '--label':
$label = $argi[1];
$label = $argi[1];
break;
case '--reason':
$additionalReason = $argi[1];
$additionalReason = $argi[1];
break;
default:
die('Unknown option: ' . $argi[0]);
Expand Down Expand Up @@ -147,7 +147,7 @@

$list = json_decode($json, true);

echo "\nFound " . count($list) . " pull request(s).\n";
echo "\nFound " . \count($list) . " pull request(s).\n";

foreach ($list as $pr) {
echo "Change Title for PR #" . $pr['number'] . "\n";
Expand Down

0 comments on commit d487cfd

Please sign in to comment.