Skip to content

Commit

Permalink
Merge branch 'main' into fix-release-pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
bjoernricks authored Jan 8, 2025
2 parents d5b8755 + 57c79b5 commit fd2354d
Show file tree
Hide file tree
Showing 45 changed files with 9,888 additions and 336 deletions.
40 changes: 0 additions & 40 deletions .docker/build.Dockerfile

This file was deleted.

5 changes: 4 additions & 1 deletion .docker/prod-oldstable.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update && \
cmake \
pkg-config \
gnupg \
libcjson-dev \
libglib2.0-dev \
libgpgme-dev \
libgnutls28-dev \
Expand All @@ -28,7 +29,7 @@ RUN apt-get update && \
libcgreen1-dev \
lcov \
&& rm -rf /var/lib/apt/lists/*
RUN cmake -DCMAKE_BUILD_TYPE=Release -B/build /source
RUN cmake -DCMAKE_BUILD_TYPE=Release -DOPENVASD=0 -B/build /source
RUN DESTDIR=/install cmake --build /build -- install

FROM debian:oldstable-slim
Expand All @@ -37,10 +38,12 @@ ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y --no-install-recommends \
libcjson1 \
libglib2.0-0 \
libgpgme11 \
libgnutls30 \
libuuid1 \
libjson-glib-1.0-0 \
libssh-gcrypt-4 \
libhiredis0.14 \
libxml2 \
Expand Down
3 changes: 2 additions & 1 deletion .docker/prod-testing.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y --no-install-recommends \
libcjson1 \
libglib2.0-0 \
libgpgme11 \
libgnutls30 \
libuuid1 \
libssh-gcrypt-4 \
libssh-dev \
libhiredis1.1.0 \
libhiredis-dev \
libxml2 \
Expand Down
2 changes: 2 additions & 0 deletions .docker/prod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y --no-install-recommends \
libcjson1 \
libglib2.0-0 \
libgpgme11 \
libgnutls30 \
libjson-glib-1.0-0 \
libuuid1 \
libssh-gcrypt-4 \
libhiredis0.14 \
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
6 changes: 5 additions & 1 deletion .github/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ apt-get update && \
cmake \
pkg-config \
gnupg \
libcjson-dev \
libcurl4-openssl-dev \
libjson-glib-dev \
libglib2.0-dev \
libgpgme-dev \
libgnutls28-dev \
uuid-dev \
libssh-gcrypt-dev \
libgcrypt-dev \
libssh-dev \
libhiredis-dev \
libxml2-dev \
libpcap-dev \
Expand Down
65 changes: 0 additions & 65 deletions .github/workflows/build-container.yml

This file was deleted.

21 changes: 18 additions & 3 deletions .github/workflows/ci-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,42 @@ jobs:
tests:
name: Unit Tests
runs-on: 'ubuntu-latest'
container: greenbone/gvm-libs-build:unstable
container: greenbone/gvm-libs:edge
steps:
- name: Install git for Codecov uploader
run: |
apt update
apt install --no-install-recommends -y ca-certificates git
rm -rf /var/lib/apt/lists/*
- uses: actions/checkout@v4
- name: Set git safe.directory
run: git config --global --add safe.directory '*'
- run: sh .github/install-dependencies.sh
- name: Configure and Compile gvm-libs
run: |
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=1 ..
cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=1 -DENABLE_COVERAGE=1 ..
make install
- name: Test gvm-libs
run: |
cd build
make tests
CTEST_OUTPUT_ON_FAILURE=1 make test
- name: Upload test coverage to Codecov
uses: codecov/codecov-action@v5
with:
file: build/coverage/coverage.xml
token: ${{ secrets.CODECOV_TOKEN }}
flags: unittests

scan-build:
name: Scan-build gvm-libs with clang
runs-on: 'ubuntu-latest'
container: greenbone/gvm-libs-build:unstable
container: greenbone/gvm-libs:edge
steps:
- uses: actions/checkout@v4
- run: sh .github/install-dependencies.sh
- name: Install clang tools
run: |
apt update
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/codeql-analysis-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
actions: read
contents: read
security-events: write
container: greenbone/gvm-libs-build:unstable
container: greenbone/gvm-libs:edge

strategy:
fail-fast: false
Expand All @@ -30,6 +30,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- run: sh .github/install-dependencies.sh
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
Expand Down
Loading

0 comments on commit fd2354d

Please sign in to comment.