Question

嘿所以我正在使用这样的帖子：

<?php
file_put_contents('deploy.log', serialize($_POST['payload']), FILE_APPEND);

$repo_dir = '/home/admin/web/website/repo-fullstack.git';
$web_root_dir = '/home/admin/web/website/public_html';

// Full path to git binary is required if git is not in your PHP user's path. Otherwise just use 'git'.
$git_bin_path = 'git';

$update = false;

// Parse data from Bitbucket hook payload
$payload = json_decode($_POST['payload']);

if (empty($payload->commits)){
  // When merging and pushing to bitbucket, the commits array will be empty.
  // In this case there is no way to know what branch was pushed to, so we will do an update.
  $update = true;
} else {
  foreach ($payload->commits as $commit) {
    $branch = $commit->branch;
    if ($branch === 'production' || isset($commit->branches) && in_array('production', $commit->branches)) {
      $update = true;
      break;
    }
  }
}

if ($update) {
  // Do a git checkout to the web root
  exec('cd ' . $repo_dir . ' && ' . $git_bin_path  . ' fetch');
  exec('cd ' . $repo_dir . ' && GIT_WORK_TREE=' . $web_root_dir . ' ' . $git_bin_path  . ' checkout -f');

  // Log the deployment
  $commit_hash = shell_exec('cd ' . $repo_dir . ' && ' . $git_bin_path  . ' rev-parse --short HEAD');
  file_put_contents('deploy.log', date('m/d/Y h:i:s a') . " Deployed branch: " .  $branch . " Commit: " . $commit_hash . "\n", FILE_APPEND);
}
?>

问题是POST HOOK获得旧提交，并且没有获得最新提交。我注意到即使是ROOT用户。我运行命令git rev-parse --short HEAD它也获得了旧的提交。所以它绝对不是权限问题。

为什么这个命令不起作用的原因？我只是不明白为什么会得到一个旧的提交。

编辑：如果您想知道的话，最奇怪的问题是，它会获得POST HOOK的正确描述。只是没有正确的提交。 WTF是这个吗？

Answer 1

此脚本中存在几个问题：

$branch = $commit->branch;

将其替换为

$branch = $payload->repository->default_branch

它执行git fetch，但你需要一个git pull，所以在fetch之后添加它

exec('cd ' . $repo_dir . ' && ' . $git_bin_path  . ' pull');

我还遇到了从回购中删除文件的问题，但仍然存在。要解决这个问题，请在git checkout之后添加一个git clean：

exec('GIT_WORK_TREE=' . $web_root_dir . ' ' . $git_bin_path  . ' clean -fdx');

整个事情看起来像这样，我也添加了一个不错的邮件功能：

<?php
$repo_dir = '/srv/users/YOURUSER/gitrepo/APPLICATIONAME';
$web_root_dir = '/srv/users/YOURUSER/apps/APPLICATIONAME/public';

// Full path to git binary is required if git is not in your PHP user's path. Otherwise just use 'git'.
$git_bin_path = 'git';

// Parse data from Github hook payload
$payload = json_decode($_POST['payload']);

$empty = false;
$update = false;

if (empty($payload->commits)){
  // When merging and pushing to bitbucket, the commits array will be empty.
  // In this case there is no way to know what branch was pushed to, so we will do an update.
  $empty = true;
  $update = true;
} else {
    $branch = $payload->repository->default_branch;
    $message = $payload->head_commit->message;

    if ($branch === 'master' ) {
      $update = true;
    }
}
if ($update) {
  // Do a git checkout to the web root
  exec('cd ' . $repo_dir . ' && ' . $git_bin_path  . ' fetch');
  exec('cd ' . $repo_dir . ' && ' . $git_bin_path  . ' pull');
  exec('cd ' . $repo_dir . ' &&  GIT_WORK_TREE=' . $web_root_dir . ' ' . $git_bin_path  . ' checkout -f');
  exec('cd ' . $repo_dir . ' &&  GIT_WORK_TREE=' . $web_root_dir . ' ' . $git_bin_path  . ' clean -fdx');

  // Log the deployment
  $commit_hash = shell_exec('cd ' . $repo_dir . ' && ' . $git_bin_path  . ' rev-parse --short HEAD');
  file_put_contents('.deploy.log', date('Y-m-d H:i:s') . "  Github -- " .  $message   . " HASH: " . $commit_hash . "\n", FILE_APPEND);

    // prepare and send the notification email
    $headers = "From: github@YOURDOMAIN.COM\r\n";
    $headers .= 'CC: ' . $payload->pusher->email . "\r\n"; 
    $headers .= "MIME-Version: 1.0\r\n";
    $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";

    // send mail to someone, and the github user who pushed the commit
    $body = '<p>The Github user <a href="https://github.com/'
    . $payload->pusher->name .'">@' . $payload->pusher->name . '</a>'
    . ' has pushed to <b>' . $payload->repository->url
    . '</b></p>';
    $body .= '<p>Here\'s a brief list of what has been changed:</p>';
    $body .= '<ul>';
    foreach ($payload->commits as $commit) {
        $body .= '<li>'.$commit->message.'<br />';
        $body .= '<small style="color:#e67e22 ">Modified: </small><b>'.count($commit->modified)
            .'</b> &nbsp; <small style="color:#58d68d ">Added: </small><b>'.count($commit->added)
            .'</b> &nbsp; <small style="color:#e74c3c">Removed: </small><b>'.count($commit->removed)
            .'</b> &nbsp; <a href="' . $commit->url
            . '">Compare here</a></li>';
    }
    $body .= '</ul>';
    $body .= '</pre>';
    $body .= '<p>Thanks for contributing, <br/>Github Webhook Endpoint';
    $body .= ' @ '.$_SERVER['REMOTE_ADDR'].'</p>';

    mail('REPOADMIN@YOURDOMAIN.COM', 'Deployed to YOURAPPLICATION', $body, $headers);
    echo(date('Y-m-d H:i:s'));
    echo(" \r\n$message deployed");

} else {
    header('HTTP/1.1 500 Internal Server Error');
}
?>

git rev-parse --short HEAD没有得到最新的提交

1 个答案: