Merge main into v2

.github/workflows/codeql.yml

@@ -0,0 +1,40 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main", v*, v2 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+  schedule:
+    - cron: '33 15 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        queries: security-and-quality
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/conventional-commits.yml

@@ -3,6 +3,9 @@ name: Conventional Commits
 on:
   pull_request:
 
+permissions:
+  pull-requests: write
+
 jobs:
   conventional-commits:
     name: Report Conventional Commits

admin-bypass/action.yaml

@@ -23,35 +23,9 @@ branding:
 runs:
   using: "composite"
   steps:
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      id: python
-      with:
-        python-version: "3.10"
-    - name: Virtual Environment
+    - name: Set up Python and pontos
       id: virtualenv
-      run: |
-        echo "path=${{ github.action_path }}/${{ github.action }}-venv" >> $GITHUB_OUTPUT
-        echo "name=${{ github.action }}-venv" >> $GITHUB_OUTPUT
-      shell: bash
-    - name: Cache Virtual Environment
-      id: cache-virtualenv
-      uses: actions/cache@v3
-      with:
-        key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ steps.virtualenv.outputs.name }}
-        path: ${{ steps.virtualenv.outputs.path }}
-    - name: Create virtual environment
-      if: ${{ steps.cache-virtualenv.outputs.cache-hit != 'true' }}
-      run: |
-        python -m venv ${{ steps.virtualenv.outputs.path }}
-      shell: bash
-    - name: Install pontos
-      run: |
-        source ${{ steps.virtualenv.outputs.path }}/bin/activate
-        python -m pip install --upgrade pip
-        python -m pip install --upgrade pontos
-        wget https://github.com/greenbone/pontos/raw/main/scripts/github/enforce-admins.py -O ~/enforce-admins.py
-      shell: bash
+      uses: greenbone/actions/setup-pontos@v2
     - name: allow/not allow bypass?
       run: |
         if [[ "${{inputs.allow}}" == "true" ]];
@@ -67,7 +41,8 @@ runs:
       # in case of blubber input let the branch be unlocked!
     - name: Prepare release and store the version
       run: |
-        source ${{ steps.virtualenv.outputs.path }}/bin/activate
+        source ${{ steps.virtualenv.outputs.activate }}
+        wget https://github.com/greenbone/pontos/raw/main/scripts/github/enforce-admins.py -O ~/enforce-admins.py
         pontos-github-script ~/enforce-admins.py ${{ inputs.repository }} ${{ inputs.branch }} ${{ env.ALLOW_OPT }}
       shell: bash
       env:

backport-pull-request/action.yml

@@ -26,7 +26,7 @@ runs:
     - name: Set up Python and Poetry
       uses: greenbone/actions/poetry@v2
       with:
-        version: ${{ inputs.python-version }}
+        python-version: ${{ inputs.python-version }}
         poetry-version: ${{ inputs.poetry-version }}
         working-directory: ${{ github.action_path }}
         without-dev: "true"

check-version/action.yaml

@@ -18,37 +18,14 @@ runs:
   using: "composite"
   steps:
     - uses: actions/checkout@v3
-    - name: Set up Python ${{ inputs.python-version }}
-      uses: actions/setup-python@v4
-      id: python
-      with:
-        python-version: ${{ inputs.python-version}}
-    - name: Virtual Environment
+    - name: Set up Python ${{ inputs.python-version }} and pontos
+      uses: actions/setup-pontos@v2
       id: virtualenv
-      run: |
-        echo "path=${{ github.action_path }}/${{ github.action }}-venv" >> $GITHUB_OUTPUT
-        echo "name=${{ github.action }}-venv" >> $GITHUB_OUTPUT
-      shell: bash
-    - name: Cache Virtual Environment
-      id: cache-virtualenv
-      uses: actions/cache@v3
       with:
-        key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ steps.virtualenv.outputs.name }}
-        path: ${{ steps.virtualenv.outputs.path }}
-    - name: Create virtual environment
-      if: ${{ steps.cache-virtualenv.outputs.cache-hit != 'true' }}
-      run: |
-        python -m venv ${{ steps.virtualenv.outputs.path }}
-      shell: bash
-    - name: Install pontos
-      run: |
-        source ${{ steps.virtualenv.outputs.path }}/bin/activate
-        python -m pip install -U pip
-        python -m pip install pontos
-      shell: bash
+        python-version: ${{ inputs.python-version}}
     - name: Check version information
       run: |
-        source ${{ steps.virtualenv.outputs.path }}/bin/activate
+        source ${{ steps.virtualenv.outputs.activate }}
         python -m pontos.version verify current
       shell: bash
       working-directory: ${{ inputs.working-directory }}

conventional-commits/README.md

@@ -11,6 +11,10 @@ name: Conventional Commits
 on:
   pull_request:
 
+permissions:
+  pull-requests: write
+  contents: read
+
 jobs:
   conventional-commits:
     name: Report Conventional Commits

conventional-commits/action.yml

@@ -25,7 +25,7 @@ runs:
     - name: Set up Python and Poetry
       uses: greenbone/actions/poetry@v2
       with:
-        version: ${{ inputs.python-version }}
+        python-version: ${{ inputs.python-version }}
         poetry-version: ${{ inputs.poetry-version }}
         working-directory: ${{ github.action_path }}
         without-dev: "true"

coverage-python/action.yaml

@@ -8,6 +8,7 @@ inputs:
     deprecationMessage: "version input is deprecated. Please use `python-version` input instead."
   python-version:
     description: "Python version that should be installed"
+    default: "3.10"
   test-command:
     description: "Command to run the tests"
     required: true

download-artifact/action.yml

@@ -58,7 +58,7 @@ runs:
     - name: Set up Python and Poetry
       uses: greenbone/actions/poetry@v2
       with:
-        version: ${{ inputs.python-version }}
+        python-version: ${{ inputs.python-version }}
         poetry-version: ${{ inputs.poetry-version }}
         working-directory: ${{ github.action_path }}
         without-dev: "true"