aboutsummaryrefslogtreecommitdiffstats
path: root/src/blogc-git-receiver
diff options
context:
space:
mode:
authorRafael G. Martins <rafael@rafaelmartins.eng.br>2016-11-17 23:18:40 +0100
committerRafael G. Martins <rafael@rafaelmartins.eng.br>2016-11-17 23:18:40 +0100
commitfc52952914747dc937c805baa211a251a795b847 (patch)
treea32459b3bc63106dc049710b0b60878f253a7767 /src/blogc-git-receiver
parent984fa87451c9dd3ef2d9ec7976af97ce88bac6d7 (diff)
downloadblogc-fc52952914747dc937c805baa211a251a795b847.tar.gz
blogc-fc52952914747dc937c805baa211a251a795b847.tar.bz2
blogc-fc52952914747dc937c805baa211a251a795b847.zip
git-receiver: allow users to re-run the last successful build
running the pre-receive hook manually on the server will re-run the last successful build.
Diffstat (limited to 'src/blogc-git-receiver')
-rw-r--r--src/blogc-git-receiver/pre-receive.c50
1 files changed, 47 insertions, 3 deletions
diff --git a/src/blogc-git-receiver/pre-receive.c b/src/blogc-git-receiver/pre-receive.c
index 5d2ead8..99e15dd 100644
--- a/src/blogc-git-receiver/pre-receive.c
+++ b/src/blogc-git-receiver/pre-receive.c
@@ -7,6 +7,7 @@
*/
#include <stdio.h>
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -15,6 +16,7 @@
#include <sys/wait.h>
#include <dirent.h>
#include <time.h>
+#include <libgen.h>
#include "../common/utils.h"
#include "../common/stdin.h"
#include "pre-receive-parser.h"
@@ -92,10 +94,45 @@ bgr_pre_receive_hook(int argc, char *argv[])
{
int rv = 0;
char buffer[4096];
+ char *master = NULL;
- char *input = bc_stdin_read();
- char *master = bgr_pre_receive_parse(input);
- free(input);
+ if (isatty(STDIN_FILENO)) {
+ char *hooks_dir = dirname(argv[0]); // this was validated by main()
+ char *real_hooks_dir = realpath(hooks_dir, NULL);
+ if (real_hooks_dir == NULL) {
+ fprintf(stderr, "error: failed to guess repository root.\n");
+ return 1;
+ }
+ char *repo_dir = dirname(real_hooks_dir);
+ char *htdocs_sym = bc_strdup_printf("%s/htdocs", repo_dir);
+ free(real_hooks_dir);
+ if (0 != access(htdocs_sym, F_OK)) {
+ fprintf(stderr, "error: no previous build found. nothing to "
+ "rebuild.\n");
+ return 1;
+ }
+ char *build_dir = realpath(htdocs_sym, NULL);
+ free(htdocs_sym);
+ if (build_dir == NULL) {
+ fprintf(stderr, "error: failed to get the hash of last built "
+ "commit.\n");
+ return 1;
+ }
+ char **pieces = bc_str_split(basename(build_dir), '-', 2);
+ free(build_dir);
+ if (bc_strv_length(pieces) != 2) {
+ fprintf(stderr, "error: failed to parse the hash of last built "
+ "commit.\n");
+ return 1;
+ }
+ master = bc_strdup(pieces[0]);
+ bc_strv_free(pieces);
+ }
+ else {
+ char *input = bc_stdin_read();
+ master = bgr_pre_receive_parse(input);
+ free(input);
+ }
if (master == NULL) {
fprintf(stderr, "warning: no reference to master branch found. "
@@ -168,6 +205,13 @@ bgr_pre_receive_hook(int argc, char *argv[])
unsigned long epoch = time(NULL);
output_dir = bc_strdup_printf("%s/builds/%s-%lu", home, master, epoch);
+
+ if (0 == access(output_dir, F_OK)) {
+ char *tmp = output_dir;
+ output_dir = bc_strdup_printf("%s-", tmp);
+ free(tmp);
+ }
+
char *gmake_cmd = bc_strdup_printf(
"%s -j%d OUTPUT_DIR=\"%s\" BLOGC_GIT_RECEIVER=1", make_impl,
cpu_count(), output_dir);