Merge branch 'gsa-8.0' into TestAlert

greenbone · Apr 8, 2019 · c5622a3 · c5622a3
2 parents 8bce03f + 9440bdf
commit c5622a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -77,7 +77,7 @@ jobs:
       - checkout
       - run:
           name: Configure and compile
-          command: mkdir build && cd build/ && cmake -DCMAKE_BUILD_TYPE=Release -DSKIP_GSA=1 .. && make install
+          command: mkdir build && rm -rf .git && cd build/ && cmake -DCMAKE_BUILD_TYPE=Release -DSKIP_GSA=1 .. && make install
   build_gsa:
     docker:
       - image: greenbone/build-env-gsa-master-debian-stretch-node8-ng

diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,10 @@ or get the entire source code repository and view log history:
 $ git clone https://github.com/greenbone/gsa.git
 $ cd gsa && git checkout gsa-8.0 && git log
 
+## gsa 8.0.1 (unreleased)
+
+ * Fix release build #1259
+
 ## gsa 8.0.0 (2018-04-05)
 
 This is the first release of the gsa module 8.0 for the Greenbone

diff --git a/gsad/src/gsad.c b/gsad/src/gsad.c
@@ -88,7 +88,7 @@
 #include <gvm/util/fileutils.h>
 #include <microhttpd.h>
 
-#ifdef GIT_REV_AVAILABLE
+#ifdef GIT_REVISION
 #include "gitrevision.h"
 #endif