Skip to content

Commit

Permalink
Merge branch 'main' into add-gzip-stream
Browse files Browse the repository at this point in the history
  • Loading branch information
timopollmeier authored Oct 16, 2024
2 parents b3be202 + 359a391 commit f70b2c8
Show file tree
Hide file tree
Showing 16 changed files with 3,140 additions and 274 deletions.
2 changes: 1 addition & 1 deletion .docker/prod-testing.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN apt-get update && \
libgpgme11 \
libgnutls30 \
libuuid1 \
libssh-gcrypt-4 \
libssh-dev \
libhiredis1.1.0 \
libhiredis-dev \
libxml2 \
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* @greenbone/gvm-libs-maintainers

# dev ops
.github/ @greenbone/devops @greenbone/gvm-libs-maintainers
.docker/ @greenbone/devops @greenbone/gvm-libs-maintainers
.github/ @greenbone/gvm-libs-maintainers
.docker/ @greenbone/gvm-libs-maintainers
3 changes: 2 additions & 1 deletion .github/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ apt-get update && \
libgpgme-dev \
libgnutls28-dev \
uuid-dev \
libssh-gcrypt-dev \
libgcrypt-dev \
libssh-dev \
libhiredis-dev \
libxml2-dev \
libpcap-dev \
Expand Down
184 changes: 0 additions & 184 deletions .github/workflows/container.yml

This file was deleted.

78 changes: 75 additions & 3 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Push to Greenbone Registry
name: Build & Push to Greenbone Registry

on:
push:
Expand All @@ -14,8 +14,8 @@ on:
required: true

jobs:
build:
name: Build and Push to Greenbone Registry
build-push-debian-stable-container:
name: Build and Push debian:stable to Greenbone Registry
uses: greenbone/workflows/.github/workflows/container-build-push-2nd-gen.yml@main
with:
image-url: community/gvm-libs
Expand All @@ -24,3 +24,75 @@ jobs:
org.opencontainers.image.base.name=debian:stable-slim
ref-name: ${{ inputs.ref-name }}
secrets: inherit

build-push-debian-oldstable-container:
name: Build and Push debian:oldstable to Greenbone Registry
uses: greenbone/workflows/.github/workflows/container-build-push-2nd-gen.yml@main
with:
build-docker-file: .docker/prod-oldstable.Dockerfile
image-url: community/gvm-libs
image-labels: |
org.opencontainers.image.vendor=Greenbone
org.opencontainers.image.base.name=debian:stable-slim
base-image-label: "oldstable"
ref-name: ${{ inputs.ref-name }}
secrets: inherit

build-push-debian-testing-container:
name: Build and Push debian:testing to Greenbone Registry
uses: greenbone/workflows/.github/workflows/container-build-push-2nd-gen.yml@main
with:
build-docker-file: .docker/prod-testing.Dockerfile
image-url: community/gvm-libs
image-labels: |
org.opencontainers.image.vendor=Greenbone
org.opencontainers.image.base.name=debian:stable-slim
base-image-label: "testing"
ref-name: ${{ inputs.ref-name }}
secrets: inherit

# triggers projects that work with stable branches on a new stable tag
trigger-stable-projects:
needs: build-push-debian-stable-container
if: github.ref_type == 'tag' && startsWith(github.ref_name, 'v')
name: Trigger update container images in related projects for new tags
strategy:
fail-fast: false
matrix:
repository: ["greenbone/gvmd", "greenbone/gsad"]
runs-on: ubuntu-latest
steps:
- name: Trigger ${{ matrix.repository }} build container image build
uses: greenbone/actions/trigger-workflow@v3
with:
token: ${{ secrets.GREENBONE_BOT_TOKEN }}
repository: ${{ matrix.repository }}
workflow: build-container.yml
ref: main
- name: Trigger ${{ matrix.repository }} container image build
uses: greenbone/actions/trigger-workflow@v3
with:
token: ${{ secrets.GREENBONE_BOT_TOKEN }}
repository: ${{ matrix.repository }}
workflow: container.yml
ref: main

trigger-related-projects:
needs: build-push-debian-stable-container
if: github.event_name != 'pull_request'
name: Trigger update container images in related projects
strategy:
fail-fast: false
matrix:
repository:
- "greenbone/openvas-scanner"
- "greenbone/boreas"
runs-on: ubuntu-latest
steps:
- name: Trigger main ${{ matrix.repository }} container image build
uses: greenbone/actions/trigger-workflow@v3
with:
token: ${{ secrets.GREENBONE_BOT_TOKEN }}
repository: ${{ matrix.repository }}
workflow: ${{ matrix.repository == 'greenbone/openvas-scanner' && 'control.yml' || 'container.yml' }}
ref: main
9 changes: 4 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ message ("-- Configuring the Greenbone Vulnerability Management Libraries...")

# VERSION: Always include major, minor and patch level.
project (gvm-libs
VERSION 22.11.0
VERSION 22.12.2
LANGUAGES C)

if (POLICY CMP0005)
Expand Down Expand Up @@ -229,10 +229,9 @@ if (BUILD_TESTS AND NOT SKIP_SRC)

add_custom_target (tests
DEPENDS array-test alivedetection-test boreas_error-test boreas_io-test
cli-test compressutils-test cpeutils-test cvss-test ping-test
sniffer-test util-test networking-test
passwordbasedauthentication-test xmlutils-test version-test osp-test
nvti-test hosts-test)
cli-test cpeutils-test cvss-test ping-test sniffer-test util-test networking-test
passwordbasedauthentication-test xmlutils-test version-test versionutils-test
osp-test nvti-test hosts-test jsonpull-test compressutils-test)

endif (BUILD_TESTS AND NOT SKIP_SRC)

Expand Down
3 changes: 2 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ Install prerequisites on Debian GNU/Linux 'Bullseye' 11:
libgpgme-dev \
libgnutls28-dev \
uuid-dev \
libssh-gcrypt-dev \
libgcrypt-dev \
libssh-dev \
libhiredis-dev \
libxml2-dev \
libpcap-dev \
Expand Down
Loading

0 comments on commit f70b2c8

Please sign in to comment.