Skip to content

Commit

Permalink
Merge pull request #781 from greenbone/y0urself/release-21.04
Browse files Browse the repository at this point in the history
[21.4.1] [release] Prepare Release and Release
y0urself authored Jun 23, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents cf0aecc + f3c272d commit a4ab602
Showing 9 changed files with 26 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-c.yml
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@ jobs:
- name: Install coverxygen and codecov
run: |
apt-get update && apt-get --assume-yes install python3-venv curl
python3 -m venv venv
. venv/bin/activate
python3 -m venv .venv
. .venv/bin/activate
pip install setuptools --upgrade
pip install 'coverxygen>=1.3.1' codecov
- name: Download XML documentation artifact
@@ -61,7 +61,7 @@ jobs:
path: /tmp/xml-doc
- name: Establish documentation coverage
run: |
. venv/bin/activate
. .venv/bin/activate
python -m coverxygen --src-dir ${{ github.workspace }} \
--xml-dir ${{steps.xml-doc-download.outputs.download-path}} \
--output lcov.info
8 changes: 4 additions & 4 deletions .github/workflows/release-pontos-patch.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release Python package with pontos
name: Release patch version with pontos

on:
pull_request:
@@ -26,8 +26,8 @@ jobs:
- name: Install pontos
run: |
apt-get update && apt-get --assume-yes install python3-venv
python3 -m venv venv
. venv/bin/activate
python3 -m venv .venv
. .venv/bin/activate
python -m pip install --upgrade pip
python -m pip install --upgrade pontos
- name: Tell git who I am
@@ -41,7 +41,7 @@ jobs:
run: echo "Current Branch is $GITHUB_BASE_REF"
- name: Prepare patch release with pontos
run: |
. venv/bin/activate
. .venv/bin/activate
pontos-release prepare --patch
- name: Release with pontos
run: |
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -2,3 +2,4 @@ build/
nasl/nasl_grammar.output
nasl/nasl_grammar.tab.c
nasl/nasl_grammar.tab.h
.venv
18 changes: 9 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ 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/).

## [21.04.1] (unreleased)
## [21.4.1] (unreleased)

### Added
- Improve nasl linter to catch more cases of undeclared variables. [#728](https://github.com/greenbone/openvas-scanner/pull/728)
@@ -21,10 +21,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Removed

[21.04.1]: https://github.com/greenbone/openvas/compare/v21.4.0...openvas-21.04
[21.4.1]: https://github.com/greenbone/openvas/compare/v21.4.1...openvas-21.04


## [21.04.0] (2021-04-15)
## [21.4.0] (2021-04-15)

### Added
- Add scanner-only option to enable tls debugging. [#558](https://github.com/greenbone/openvas/pull/558)
@@ -46,9 +46,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed
- Use the nvticache name from gvm-libs, defined in nvticache.h. [#578](https://github.com/greenbone/openvas/pull/578)

[21.04.0]: https://github.com/greenbone/openvas/compare/openvas-20.08...v21.4.0
[21.4.0]: https://github.com/greenbone/openvas/compare/openvas-20.08...v21.4.0

## [20.08.2] (unreleased)
## [20.8.2] - 2021-06-23

### Added
- Check for wrong names or values in the script_xrefs params.
@@ -79,9 +79,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Remove code from the openvas daemon era. Do not flushall redis. [#689](https://github.com/greenbone/openvas/pull/689)
- Remove deprecated option logfile. [#713](https://github.com/greenbone/openvas/pull/713)

[20.08.2]: https://github.com/greenbone/openvas/compare/v20.8.0...openvas-20.08
[20.8.2]: https://github.com/greenbone/openvas/compare/v20.8.1...openvas-20.08

## [20.08.1] (2021.02.01)
## [20.8.1] (2021.02.01)

### Added
- Extend nasl lint to detect if function parameter is used twice. [#590](https://github.com/greenbone/openvas/pull/590)
@@ -115,9 +115,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix technique switch for getting the appropriate interface to use for IPv6 dst addr. [#636](https://github.com/greenbone/openvas/pull/636)
- Fix host count. Set to -1 when the target string is invalid. [#646](https://github.com/greenbone/openvas/pull/646)

[20.08.1]: https://github.com/greenbone/openvas/compare/v20.8.0...v20.8.1
[20.8.1]: https://github.com/greenbone/openvas/compare/v20.8.0...v20.8.1

## [20.08] (2020-08-11)
## [20.8] (2020-08-11)

### Added
- Create greenbone-nvt-sync create lock file during feed sync.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ endif (CLANG_FORMAT)

# Set dev version if this is a development version and not a full release,
# unset (put value 0 or delete line) before a full release and reset after.
set (PROJECT_DEV_VERSION 0)
set (PROJECT_DEV_VERSION 1)

# If PROJECT_DEV_VERSION is set, the version string will be set to:
# "major.minor.patch~dev${PROJECT_DEV_VERSION}${GIT_REVISION}"
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ Prerequisites for openvas
Prerequisites:
* a C compiler (e.g. gcc)
* cmake >= 3.0
* libgvm_base, libgvm_util >= 21.4
* libgvm_base, libgvm_util >= 21.4.1
* glib-2.0 >= 2.42
* gio-2.0
* bison
4 changes: 2 additions & 2 deletions misc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@ endif (NOT PKG_CONFIG_FOUND)
pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
pkg_check_modules (GNUTLS REQUIRED gnutls>=3.6.4)

pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=21.4)
pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=21.4)
pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=21.4.1)
pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=21.4.1)

pkg_check_modules (OPENVAS_WMICLIENT libopenvas_wmiclient>=1.0.5)
pkg_check_modules (OPENVAS_WINCMD libopenvas_wincmd>=1.0.5)
4 changes: 2 additions & 2 deletions nasl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -51,8 +51,8 @@ endif (NOT PKG_CONFIG_FOUND)
pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
pkg_check_modules (GIO REQUIRED gio-2.0)
pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15)
pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=21.4)
pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=21.4)
pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=21.4.1)
pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=21.4.1)

pkg_check_modules (OPENVAS_WMICLIENT libopenvas_wmiclient>=1.0.5)
pkg_check_modules (OPENVAS_WINCMD libopenvas_wincmd>=1.0.5)
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -26,9 +26,9 @@ if (NOT PKG_CONFIG_FOUND)
message(FATAL_ERROR "pkg-config executable not found. Aborting.")
endif (NOT PKG_CONFIG_FOUND)

pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=21.4)
pkg_check_modules (LIBGVM_BOREAS REQUIRED libgvm_boreas>=21.4)
pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=21.4)
pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=21.4.1)
pkg_check_modules (LIBGVM_BOREAS REQUIRED libgvm_boreas>=21.4.1)
pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=21.4.1)
pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)

message (STATUS "Looking for libgcrypt...")

0 comments on commit a4ab602

Please sign in to comment.