From ff1caa1de78856d97a8ee724e01dbed566b2dd79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaspar=20L=C3=B6chte?= Date: Fri, 25 Jun 2021 11:23:48 +0200 Subject: [PATCH 1/5] Add the full build workflow to 20.08 --- .github/workflows/ci-c.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/ci-c.yml b/.github/workflows/ci-c.yml index 57d1e5cad0..e3e8434947 100644 --- a/.github/workflows/ci-c.yml +++ b/.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/checkout@v2.3.4 + - name: Configure and compile + run: | + mkdir build && rm -rf .git && cd build/ \ + && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && make install + working-directory: ${{ github.WORKSPACE }} From 6da30c0bec6343336aafc830d91316cb1627a3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaspar=20L=C3=B6chte?= Date: Fri, 25 Jun 2021 11:24:12 +0200 Subject: [PATCH 2/5] Remove the ProjectVersion and replace it with GetGit --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 095d436d86..c86cb71c76 100644 --- a/CMakeLists.txt +++ b/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 From 9f2f30e28d43175a202bbd7ca442a3763c64da33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaspar=20L=C3=B6chte?= Date: Fri, 25 Jun 2021 11:25:06 +0200 Subject: [PATCH 3/5] Mention g++ in install, just in case --- INSTALL.md | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL.md b/INSTALL.md index f2dd8c73fc..26436b8615 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -21,6 +21,7 @@ Prerequisites: * libxml * libmicrohttpd >= 0.9.0 * pkg-config +* g++ [when not using clang] Prerequisites for using translations: * gettext From e692b6c74b3ccf1e4039b5ea69123a2f7fb4a8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaspar=20L=C3=B6chte?= Date: Fri, 25 Jun 2021 11:25:21 +0200 Subject: [PATCH 4/5] Add the new badges --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bfcc2fd95e..d5b57d9661 100644 --- a/README.md +++ b/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 From be29e66a458ad0e120b47162e783e9ba08670d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaspar=20L=C3=B6chte?= Date: Fri, 25 Jun 2021 11:27:26 +0200 Subject: [PATCH 5/5] Adjust the changelog --- CHANGELOG.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bd0986dab..022a0c5b75 100644 --- a/CHANGELOG.md +++ b/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) @@ -16,12 +25,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Use greenbone sensor as default scanner type when opening the dialog if available [#2867](https://github.com/greenbone/gsa/pull/2867) ### Fixed +* 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