makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17514] Replace phpbb3 with phpbb in git-tools

Browse source 
PHPBB-17514
This commit is contained in:
Marc Alexander 2025-05-20 20:54:31 +02:00
parent 9adb7eb9fe
commit e9e7aeb756
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-tools/hooks/commit-msg
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# A hook to check syntax of a phpBB3 commit message, per: # A hook to check syntax of a phpBB commit message, per:
# * <https://area51.phpbb.com/docs/dev/master/development/git.html> # * <https://area51.phpbb.com/docs/dev/master/development/git.html>
# * <http://area51.phpbb.com/phpBB/viewtopic.php?p=209919#p209919> # * <http://area51.phpbb.com/phpBB/viewtopic.php?p=209919#p209919>
# #

6
git-tools/merge.php
View file

@ -56,7 +56,7 @@ catch (RuntimeException $e)
function work($pull_id, $remote) function work($pull_id, $remote)
{ {
// Get some basic data // Get some basic data
$pull = get_pull('phpbb', 'phpbb3', $pull_id); $pull = get_pull('phpbb', 'phpbb', $pull_id);
if (!$pull_id) if (!$pull_id)
{ {
@ -79,7 +79,7 @@ function work($pull_id, $remote)
run("git checkout develop-olympus"); run("git checkout develop-olympus");
run("git pull $remote develop-olympus"); run("git pull $remote develop-olympus");
add_remote($pull_user, 'phpbb3'); add_remote($pull_user, 'phpbb');
run("git fetch $pull_user"); run("git fetch $pull_user");
run("git merge --no-ff $pull_user/$pull_branch"); run("git merge --no-ff $pull_user/$pull_branch");
run("phpBB/vendor/bin/phpunit"); run("phpBB/vendor/bin/phpunit");
@ -94,7 +94,7 @@ function work($pull_id, $remote)
run("git checkout develop"); run("git checkout develop");
run("git pull $remote develop"); run("git pull $remote develop");
add_remote($pull_user, 'phpbb3'); add_remote($pull_user, 'phpbb');
run("git fetch $pull_user"); run("git fetch $pull_user");
run("git merge --no-ff $pull_user/$pull_branch"); run("git merge --no-ff $pull_user/$pull_branch");
run("phpBB/vendor/bin/phpunit"); run("phpBB/vendor/bin/phpunit");