hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supporing [skip ci] or [no ci] in post-commit

Browse Source
This commit is contained in:
hyung-hwan 2021-09-14 13:21:54 +00:00
parent bffa9feb51
commit 37b37f125e
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
codepot/etc/post-commit.in
View File

@ -449,7 +449,14 @@ sub format_commit_url
sub trigger_webhooks
{
my ($cfg, $dbh, $prefix, $projectid) = @_;
my ($cfg, $dbh, $prefix, $projectid, $commit_message) = @_;
# find [skip ci] or [no ci]
if ($commit_message =~ /\[(skip|no) ci\]/g)
{
## no webhooks triggered
return (0, undef);
}
my $query = $dbh->prepare("SELECT ${QC}webhooks${QC} FROM ${QC}${prefix}project${QC} WHERE ${QC}id${QC}=?");
if (!$query || !$query->execute($projectid))
@ -542,7 +549,7 @@ if (lc($cfg->{commit_notification}) eq 'yes')
email_message_to_project_members ($cfg, $dbh, $cfg->{database_prefix}, $REPOBASE, $commit_subject, $commit_message);
}
trigger_webhooks ($cfg, $dbh, $cfg->{database_prefix}, $REPOBASE);
trigger_webhooks ($cfg, $dbh, $cfg->{database_prefix}, $REPOBASE, $raw_commit_message);
close_database ($dbh);

2
codepot/src/codepot/controllers/project.php
View File

@ -294,7 +294,7 @@ class Project extends CI_Controller
$project->name = '';
$project->summary = '';
$project->description = '';
$project->wehhooks = '';
$project->webhooks = '';
$project->commitable = 'Y';
$project->public = 'Y';
$project->members = array ($login['id']);