From 83cb1baf4fefb08f397f440d5a8ecdc7eef47503 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 8 Oct 2012 21:35:25 +0100 Subject: Report if we spot CI builds. Sorry for the noise --- utils/git-testament.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/git-testament.pl b/utils/git-testament.pl index ac4c97e89..e8f56c7fb 100644 --- a/utils/git-testament.pl +++ b/utils/git-testament.pl @@ -141,6 +141,9 @@ $testament .= "#define WT_COMPILEDATE \"$compiledate\"\n"; my $cibuild = $ENV{CI_BUILD}; if (defined ($cibuild) && ($cibuild ne '')) { $testament .= "#define CI_BUILD \"$cibuild\"\n"; + print "TESTMENT: Detected CI build \"$cibuild\"\n"; +} else { + print "TESTMENT: No sign of the CI system here\n"; } $testament .= "#define WT_BRANCHPATH \"$gitinfo{branch}\"\n"; -- cgit v1.2.3 From b8af03872611340d9409c8b977288eb88c4ec42a Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 8 Oct 2012 21:50:12 +0100 Subject: Throw a #warning when the CI build is detected. Sorry for the noise --- desktop/version.c | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/version.c b/desktop/version.c index 262b41fda..6cb145b27 100644 --- a/desktop/version.c +++ b/desktop/version.c @@ -3,6 +3,7 @@ const char * const netsurf_version = "3.0 (Dev" #if defined(CI_BUILD) " CI #" CI_BUILD +#warning Discovered CI build. #endif ")" ; -- cgit v1.2.3 From 4945eeac2f01bdaa82b2bb11f7335ba7112692e1 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 8 Oct 2012 21:59:47 +0100 Subject: Revert previous two commits now that we've diagnosed the CI hiccough --- desktop/version.c | 1 - utils/git-testament.pl | 3 --- 2 files changed, 4 deletions(-) diff --git a/desktop/version.c b/desktop/version.c index 6cb145b27..262b41fda 100644 --- a/desktop/version.c +++ b/desktop/version.c @@ -3,7 +3,6 @@ const char * const netsurf_version = "3.0 (Dev" #if defined(CI_BUILD) " CI #" CI_BUILD -#warning Discovered CI build. #endif ")" ; diff --git a/utils/git-testament.pl b/utils/git-testament.pl index e8f56c7fb..ac4c97e89 100644 --- a/utils/git-testament.pl +++ b/utils/git-testament.pl @@ -141,9 +141,6 @@ $testament .= "#define WT_COMPILEDATE \"$compiledate\"\n"; my $cibuild = $ENV{CI_BUILD}; if (defined ($cibuild) && ($cibuild ne '')) { $testament .= "#define CI_BUILD \"$cibuild\"\n"; - print "TESTMENT: Detected CI build \"$cibuild\"\n"; -} else { - print "TESTMENT: No sign of the CI system here\n"; } $testament .= "#define WT_BRANCHPATH \"$gitinfo{branch}\"\n"; -- cgit v1.2.3