Merge branch 'gsa-20.08' into FilterDialogInitialSeverity

.github/workflows/ci-c.yml

@@ -38,3 +38,21 @@ jobs:
           mkdir build && rm -rf .git && cd build/ \
             && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && make install
         working-directory: ${{ env.WORKSPACE }}
+  build_full:
+     name: Build gsa and gsad from root dir
+     runs-on: 'ubuntu-latest'
+     strategy:
+       matrix:
+         build_type:
+           - Debug
+           - Release
+     container: greenbone/build-env-gsa-20.08-debian-buster-gcc-gsa-full
+     env:
+       BUILD_TYPE: ${{ matrix.build_type }}
+     steps:
+       - uses: actions/[email protected]
+       - name: Configure and compile
+         run: |
+           mkdir build && rm -rf .git && cd build/ \
+             && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && make install
+         working-directory: ${{ github.WORKSPACE }}

CHANGELOG.md

@@ -4,7 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [20.8.2] - 2021-06-24
+## [Unreleased]
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+
+ [Unreleased]: https://github.com/greenbone/gsa/compare/v20.8.2...gsa-20.08
+
+## [20.8.2] - 2021-06-25
 
 ### Added
 - Show type of xrefs in NVT details [#2980](https://github.com/greenbone/gsa/pull/2980)
@@ -17,12 +26,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - Initialize severity value with 0 in powerfilter SeverityValuesGroup [#3031](https://github.com/greenbone/gsa/pull/3031)
+- Removed a CMake dependency in the CMakeLists, so GSA can be build again. [#3030](https://github.com/greenbone/gsa/pull/3030)
 - Fixed setting whether to include related resources for new permissions [#2931](https://github.com/greenbone/gsa/pull/2891)
 - Fixed setting secret key in RADIUS dialog, backport from [#2891](https://github.com/greenbone/gsa/pull/2891), [#2915](https://github.com/greenbone/gsa/pull/2915)
 
 ### Removed
 
-[20.8.2]: https://github.com/greenbone/gsa/compare/v20.8.2...v20.8.1
+[20.8.2]: https://github.com/greenbone/gsa/compare/v20.8.1...v20.8.2
 
 ## [20.8.1] - 2021-02-02
 

CMakeLists.txt

@@ -46,7 +46,7 @@ endif (PROJECT_DEV_VERSION)
 set (PROJECT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_SUFFIX}${GIT_REVISION}")
 
 ## Retrieve git revision (at configure time)
-include (ProjectVersion)
+include (GetGit)
 
 ## Variables
 

INSTALL.md

@@ -21,6 +21,7 @@ Prerequisites:
 * libxml
 * libmicrohttpd >= 0.9.0
 * pkg-config
+* g++ [when not using clang]
 
 Prerequisites for using translations:
 * gettext

README.md

@@ -4,7 +4,8 @@
 
 [![GitHub releases](https://img.shields.io/github/release/greenbone/gsa.svg)](https://github.com/greenbone/gsa/releases)
 [![code test coverage](https://codecov.io/gh/greenbone/gsa/branch/gsa-20.08/graph/badge.svg)](https://codecov.io/gh/greenbone/gsa)
-[![CircleCI](https://circleci.com/gh/greenbone/gsa/tree/gsa-8.0.svg?style=svg)](https://circleci.com/gh/greenbone/gsa/tree/gsa-20.08)
+[![Build and test C](https://github.com/greenbone/gsa/actions/workflows/ci-c.yml/badge.svg?branch=gsa-21.04)](https://github.com/greenbone/gsa/actions/workflows/ci-c.yml?query=branch%3Agsa-20.08++)
+ [![Build and test JS](https://github.com/greenbone/gsa/actions/workflows/ci-js.yml/badge.svg?branch=gsa-21.04)](https://github.com/greenbone/gsa/actions/workflows/ci-js.yml?query=branch%3Agsa-20.08++)
 
 The Greenbone Security Assistant is the web interface developed for the
 [Greenbone Security Manager