Merge pull request #26 from siemens/chore/dependabot

chore(dependabot): add dependabot.yml

.clang-format

@@ -0,0 +1,78 @@
+# Generated from CLion C/C++ Code Style settings
+# SPDX-FileCopyrightText: © Fossology contributors
+# SPDX-License-Identifier: FSFAP
+BasedOnStyle: Microsoft
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: None
+AlignConsecutiveMacros: Consecutive
+AlignEscapedNewlines: DontAlign
+AlignOperands: DontAlign
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: MultiLine
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: BeforeColon
+ColumnLimit: 80
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ContinuationIndentWidth: 4
+IncludeBlocks: Regroup
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth: 2
+KeepEmptyLinesAtTheStartOfBlocks: true
+Language: Cpp
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PointerAlignment: Left
+ReflowComments: true
+SortIncludes: CaseInsensitive
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++11
+TabWidth: 2
+UseTab: Never

.dockerignore

@@ -18,6 +18,9 @@ utils/automation/Dockerfile.ci
 
 Vagrantfile
 
+# Include README as required by CMake Debian packages.
+!README.md
+
 # omit rebuilding after changing the docker tests.
 src/testing/docker
 
@@ -156,7 +159,6 @@ variable.list
 /src/readmeoss/agent/version.php
 /src/reuser/agent/reuser
 /src/reuser/agent/version.php
-/src/reuser/agent/reuser
 /src/copyright/agent/ecc
 /src/copyright/VERSION-ecc
 /src/copyright/VERSION-keyword

.github/dependabot.yml

@@ -0,0 +1,25 @@
+# Dependabot configuration for FOSSology
+# SPDX-License-Identifier: FSFAP
+# SPDX-FileCopyrightText: © FOSSology contributors
+
+version: 2
+updates:
+  # Configuration for composer
+  - package-ecosystem: "composer"
+    directory: "/src"
+    groups:
+      composer:
+        applies-to: security-updates
+
+  - package-ecosystem: "docker"
+    directories:
+      - "/"
+      - "/utils/automation"
+    groups:
+      composer:
+        applies-to: security-updates
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build-test.yml

@@ -9,6 +9,7 @@ concurrency:
 
 on:
   push:
+    branches: [master]
   pull_request:
     branches: [master]
   workflow_dispatch:
@@ -22,7 +23,7 @@ jobs:
       DEBIAN_FRONTEND: "noninteractive"
     services:
       postgres:
-        image: postgres:13
+        image: postgres:15
         env:
           POSTGRES_DB: postgres
           POSTGRES_USER: postgres
@@ -39,26 +40,26 @@ jobs:
       matrix:
         config:
           - {
-              name: "Ubuntu 20.04 GCC 9",
-              os: ubuntu-20.04,
+              name: "Ubuntu 22.04 GCC 9",
+              os: ubuntu-22.04,
               build_type: "Debug",
               cc: "gcc-9",
               cxx: "g++-9",
               php: "8.1",
               experimental: false,
             }
           - {
-              name: "Ubuntu 20.04 GCC 8",
-              os: ubuntu-20.04,
+              name: "Ubuntu 22.04 GCC 11",
+              os: ubuntu-22.04,
               build_type: "Debug",
-              cc: "gcc-8",
-              cxx: "g++-8",
-              php: "7.4",
+              cc: "gcc-11",
+              cxx: "g++-11",
+              php: "8.1",
               experimental: false,
             }
           - {
-              name: "Ubuntu 20.04 CLANG",
-              os: ubuntu-20.04,
+              name: "Ubuntu 22.04 CLANG",
+              os: ubuntu-22.04,
               build_type: "Debug",
               cc: "clang",
               cxx: "clang++",
@@ -118,93 +119,15 @@ jobs:
         run: |
           ./utils/prepare-test -afty -u postgres -p postgres
           cd build
-          ctest --output-on-failure --verbose
+          ctest --output-on-failure --extra-verbose
         env:
           POSTGRES_HOST: localhost
           POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
           PGHOST: localhost
           PGPORT: ${{ job.services.postgres.ports[5432] }}
 
-  gcc7-test:
-    name: "Ubuntu 18.04 GCC 7"
-    runs-on: ubuntu-latest
-    container: "ubuntu:bionic"
-    env:
-      DEBIAN_FRONTEND: "noninteractive"
-    steps:
-      - name: Setup git
-        run: |
-          ## Install git
-          apt-get update
-          apt-get install -y software-properties-common
-          add-apt-repository $GIT_REPO -y
-          apt-get update
-          apt-get install git sudo -y
-
-          # Remove source repo's
-          add-apt-repository --remove $GIT_REPO -y
-          apt-get update
-        env:
-          GIT_REPO: "ppa:git-core/ppa"
-
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 50
-
-      - name: Fetch tags
-        run: |
-          chown -R $(id -u):$(id -g) .
-          git fetch --tags
-
-      - name: Install Dependencies
-        run: |
-          apt update
-          apt install -y libboost-system-dev libboost-filesystem-dev \
-            libcppunit-dev libcunit1-dev libdbd-sqlite3-perl libjsoncpp-dev \
-            libjson-c-dev liblocal-lib-perl libspreadsheet-writeexcel-perl \
-            libtext-template-perl libgcrypt20-dev gcc-7 g++-7 lsb-release \
-            php7.2-sqlite3 openjdk-11-jdk
-          ./utils/fo-installdeps --everything -y
-          echo PATH="/usr/lib/ccache/:$PATH" >> $GITHUB_ENV
-          echo COMPOSER_HOME="$HOME/.composer/" >> $GITHUB_ENV
-
-      - name: Setup Postgres
-        run: |
-          echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
-          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-          apt-get update
-          apt-get -y install postgresql-13
-          pg_lsclusters
-          pg_dropcluster --stop 13 main
-          pg_upgradecluster 10 main || echo "Postgres 10 not installed"
-          pg_ctlcluster 13 main start || true
-
-      - name: Get CMake v3.23.0
-        uses: lukka/get-cmake@v3.23.0
-
-      - name: Configure and Generate CMake Project
-        run: |
-          mkdir build
-          cmake -DCMAKE_BUILD_TYPE=Debug -GNinja -DTESTING=ON -S . -B ./build
-        env:
-          CC: gcc-7
-          CXX: g++-7
-
-      - name: Build Project
-        run: cmake --build build --config Debug --parallel
-
-      - name: Prepare Tests
-        run: |
-          ./utils/prepare-test -afty
-          echo PGPASSFILE="$HOME/.pgpass" >> $GITHUB_ENV
-
-      - name: Run Tests
-        run: |
-          cd build
-          ctest --output-on-failure --verbose
-
   php-unit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -219,7 +142,7 @@ jobs:
           }
     services:
       postgres:
-        image: postgres:12
+        image: postgres:15
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -241,7 +164,7 @@ jobs:
           sudo apt install -y libboost-system-dev libboost-filesystem-dev \
                 libcppunit-dev libcunit1-dev libdbd-sqlite3-perl libjsoncpp-dev \
                 libjson-c-dev liblocal-lib-perl libspreadsheet-writeexcel-perl \
-                libtext-template-perl libgcrypt20-dev gcc-7 g++-7 lsb-release \
+                libtext-template-perl libgcrypt20-dev gcc-11 g++-11 lsb-release \
                 openjdk-11-jdk
           sudo ./utils/fo-installdeps --everything -y
           echo PATH="/usr/lib/ccache/:$PATH" >> $GITHUB_ENV

.github/workflows/conflict-check.yml

@@ -8,6 +8,9 @@ on:
   pull_request_target:
     types: [synchronize]
 
+permissions:
+  pull-requests: write # to label PRs
+
 jobs:
   check:
     runs-on: ubuntu-latest

.github/workflows/deploy-pages.yml

@@ -14,15 +14,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Install Dependencies
         run: |
           sudo apt-get update
           sudo apt-get install --no-install-recommends -y git doxygen graphviz
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
 

.github/workflows/docker-test.yml

@@ -21,7 +21,7 @@ jobs:
       uses: docker/setup-buildx-action@v2
 
     - name: Build images
-      run: docker-compose build
+      run: docker compose build
 
     - name: Test cluster
       run: src/testing/docker/test-cluster.sh