Merge main into v2

greenbone · May 16, 2023 · 436ff0d · 436ff0d
2 parents 31f46fb + af25719
commit 436ff0d
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 46 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,11 +1,12 @@
-name: "CodeQL"
+name: CodeQL
 
 on:
   push:
-    branches: [ "main", v*, v2 ]
+    branches:
+      - main
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
+    branches:
+      - main
   schedule:
     - cron: '33 15 * * 5'
 

diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml
@@ -5,6 +5,7 @@ on:
 
 permissions:
   pull-requests: write
+  contents: read
 
 jobs:
   conventional-commits:

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -1,5 +1,7 @@
-name: 'Dependency Review'
-on: [pull_request]
+name: Dependency Review
+
+on:
+  pull_request:
 
 permissions:
   contents: read
@@ -8,5 +10,5 @@ jobs:
   dependency-review:
     runs-on: ubuntu-latest
     steps:
-      - name: 'Dependency Review'
+      - name: Dependency Review
         uses: greenbone/actions/dependency-review@v2
diff --git a/.github/workflows/sbom-upload.yml b/.github/workflows/sbom-upload.yml
@@ -2,7 +2,9 @@ name: SBOM upload
 on:
   workflow_dispatch:
   push:
-    branches: ["main"]
+    branches:
+      - main
+
 jobs:
   SBOM-upload:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test-doc-coverage.yml b/.github/workflows/test-doc-coverage.yml
@@ -2,12 +2,19 @@ name: Test Doc Coverage Actions
 
 on:
   push:
-    tags: ["*"]
-    branches: [main]
-    paths: [ "doc-coverage-clang/**", ".github/workflows/test-doc-coverage.yml" ]
+    tags:
+      - "v*"
+    branches:
+      - main
+    paths:
+      - "doc-coverage-clang/**"
+      - ".github/workflows/test-doc-coverage.yml"
   pull_request:
-    branches: [main]
-    paths: ["doc-coverage-clang/**", ".github/workflows/test-doc-coverage.yml"]
+    branches:
+      - main
+    paths:
+      - "doc-coverage-clang/**"
+      - ".github/workflows/test-doc-coverage.yml"
 
 jobs:
   test-doc-cov-clang:

diff --git a/.github/workflows/test-download-artifacts.yml b/.github/workflows/test-download-artifacts.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - "v*"
   pull_request:
 
 jobs:
@@ -15,12 +14,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Determine Branch
+        id: branch
         run: |
           if [ -n "$GITHUB_HEAD_REF" ];
           then
-            echo "BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_ENV;
+            echo "branch=${GITHUB_HEAD_REF}" >> $GITHUB_OUTPUT;
           else
-            echo "BRANCH=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV;
+            echo "branch=${GITHUB_REF##refs/*/}" >> $GITHUB_OUTPUT;
           fi;
         shell: bash
       - name: Trigger Artifact Uploading
@@ -29,29 +29,29 @@ jobs:
           token: ${{ secrets.GREENBONE_BOT_TOKEN }}
           repository: greenbone/actions
           workflow: "test-download-artifacts-test-workflow.yml"
-          ref: ${{ env.BRANCH }}
+          ref: ${{ steps.branch.outputs.branch }}
       - name: Download Artifact
         uses: ./download-artifact
         with:
           token: ${{ secrets.GREENBONE_BOT_TOKEN }}
           repository: greenbone/actions
           workflow: "test-download-artifacts-test-workflow.yml"
-          branch: ${{ env.BRANCH }}
+          branch: ${{ steps.branch.outputs.branch }}
           name: artifact
       - name: Download Artifacts
         uses: ./download-artifact
         with:
           token: ${{ secrets.GREENBONE_BOT_TOKEN }}
           repository: greenbone/actions
           workflow: "test-download-artifacts-test-workflow.yml"
-          branch: ${{ env.BRANCH }}
+          branch: ${{ steps.branch.outputs.branch }}
       - name: Ignore missing workflow
         uses: ./download-artifact
         with:
           token: ${{ secrets.GREENBONE_BOT_TOKEN }}
           repository: greenbone/actions
           workflow: "foo-bar.yml"
-          branch: ${{ env.BRANCH }}
+          branch: ${{ steps.branch.outputs.branch }}
           name: artifact
           allow-not-found: true
       - name: Ignore missing artifact
@@ -60,6 +60,6 @@ jobs:
           token: ${{ secrets.GREENBONE_BOT_TOKEN }}
           repository: greenbone/actions
           workflow: "test-download-artifacts-test-workflow.yml"
-          branch: ${{ env.BRANCH }}
+          branch: ${{ steps.branch.outputs.branch }}
           name: foo
           allow-not-found: true
diff --git a/.github/workflows/test-hashsums.yml b/.github/workflows/test-hashsums.yml
@@ -2,10 +2,10 @@ name: Test Python Actions
 
 on:
   push:
-    tags: ["*"]
+    tags:
+      - "v*"
     branches:
       - main
-      - "v*"
   pull_request:
 
 jobs:

diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -2,10 +2,10 @@ name: Test Python Actions
 
 on:
   push:
-    tags: [ "*" ]
+    tags:
+      - "v*"
     branches:
       - main
-      - "v*"
   pull_request:
 
 jobs:

diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml
@@ -2,12 +2,21 @@ name: Test Release Actions
 
 on:
   push:
-    tags: [ "*" ]
-    branches: [ main ]
-    paths: [ "release/**","release-python/**", ".github/workflows/test-release.yml" ]
+    tags:
+      - "v*"
+    branches:
+      - main
+    paths:
+      - "release/**"
+      - "release-python/**"
+      - ".github/workflows/test-release.yml"
   pull_request:
-    branches: [ main ]
-    paths: [ "release/**","release-python/**", ".github/workflows/test-release.yml" ]
+    branches:
+      - main
+    paths:
+      - "release/**"
+      - "release-python/**"
+      - ".github/workflows/test-release.yml"
 
 jobs:
   release-patch-cc:

diff --git a/.github/workflows/test-signature.yml b/.github/workflows/test-signature.yml
@@ -2,10 +2,10 @@ name: Test Python Actions
 
 on:
   push:
-    tags: ["*"]
+    tags:
+      - "v*"
     branches:
       - main
-      - "v*"
   pull_request:
 
 jobs:

diff --git a/.github/workflows/test-trigger-workflow.yml b/.github/workflows/test-trigger-workflow.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - "v*"
   pull_request:
 
 jobs:
@@ -15,12 +14,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Determine Ref
+        id: ref
         run: |
           if [ -n "$GITHUB_HEAD_REF" ];
           then
-            echo "REF=${GITHUB_HEAD_REF}" >> $GITHUB_ENV;
+            echo "ref=${GITHUB_HEAD_REF}" >> $GITHUB_OUTPUT;
           else
-            echo "REF=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV;
+            echo "ref=${GITHUB_REF##refs/*/}" >> $GITHUB_OUTPUT;
           fi;
         shell: bash
       - name: Trigger Another Workflow
@@ -31,7 +31,7 @@ jobs:
           token: ${{ secrets.GREENBONE_BOT_TOKEN }}
           repository: greenbone/actions
           workflow: "test-trigger-workflow-long-running-workflow.yml"
-          ref: ${{ env.REF }}
+          ref: ${{ steps.ref.outputs.ref }}
           wait-for-completion-timeout: 10
           wait-for-completion-interval: 10
       - name: Fail if not failed
@@ -47,12 +47,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Determine Ref
+        id: ref
         run: |
           if [ -n "$GITHUB_HEAD_REF" ];
           then
-            echo "REF=${GITHUB_HEAD_REF}" >> $GITHUB_ENV;
+            echo "ref=${GITHUB_HEAD_REF}" >> $GITHUB_OUTPUT;
           else
-            echo "REF=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV;
+            echo "ref=${GITHUB_REF##refs/*/}" >> $GITHUB_OUTPUT;
           fi;
         shell: bash
       - name: Trigger Another Workflow
@@ -61,7 +62,7 @@ jobs:
           token: ${{ secrets.GREENBONE_BOT_TOKEN }}
           repository: greenbone/actions
           workflow: "test-trigger-workflow-test-workflow.yml"
-          ref: ${{ env.REF }}
+          ref: ${{ steps.ref.outputs.ref }}
           wait-for-completion-interval: 10
 
   test-failing-workflow:
@@ -71,12 +72,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Determine Ref
+        id: ref
         run: |
           if [ -n "$GITHUB_HEAD_REF" ];
           then
-            echo "REF=${GITHUB_HEAD_REF}" >> $GITHUB_ENV;
+            echo "ref=${GITHUB_HEAD_REF}" >> $GITHUB_OUTPUT;
           else
-            echo "REF=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV;
+            echo "ref=${GITHUB_REF##refs/*/}" >> $GITHUB_OUTPUT;
           fi;
         shell: bash
       - name: Trigger Another Workflow
@@ -87,7 +89,7 @@ jobs:
           token: ${{ secrets.GREENBONE_BOT_TOKEN }}
           repository: greenbone/actions
           workflow: "test-trigger-workflow-failing-workflow.yml"
-          ref: ${{ env.REF }}
+          ref: ${{ steps.ref.outputs.ref }}
       - name: Fail if not failed
         if: ${{ success() && steps.test.outcome != 'failure' }}
         run: |

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -0,0 +1,24 @@
+name: Run unittests
+
+on:
+  push:
+    tags:
+      - "v*"
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  run-backport-pull-request-tests:
+    runs-on: ubuntu-latest
+    name: Run unit tests for backport-pull-request action
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup project
+        uses: greenbone/actions/poetry@v2
+        with:
+          working-directory: backport-pull-request
+      - name: Run unit tests
+        run: poetry run python -m unittest
+        working-directory: backport-pull-request
diff --git a/mypy-python/action.yaml b/mypy-python/action.yaml
@@ -5,10 +5,14 @@ description: "An action that verifies python type hints by using mypy"
 inputs:
   packages:
     description: "Python packages to check with mypy"
+    deprecationMessage: "packages input is deprecated. Please use `mypy-arguments` input instead."
     required: true
   version:
     description: "Python version that should be installed. Deprecated: Use `python-version` input instead."
     deprecationMessage: "version input is deprecated. Please use `python-version` input instead."
+  mypy-arguments:
+    description: "Additional arguments for running mypy"
+    default: ""
   python-version:
     description: "Python version that should be installed"
     default: "3.10"
@@ -32,15 +36,12 @@ runs:
     - name: Install poetry
       uses: greenbone/actions/poetry@v2
       with:
-        version: ${{ inputs.version }}
         python-version: ${{ inputs.python-version }}
         poetry-version: ${{ inputs.poetry-version }}
         cache: ${{ inputs.cache }}
         cache-dependency-path: ${{ inputs.cache-dependency-path }}
         cache-poetry-installation: ${{ inputs.cache-poetry-installation }}
-    - run: echo "Running mypy"
-      shell: bash
-    - run: poetry run mypy ${{ inputs.packages }}
+    - run: poetry run mypy ${{ inputs.mypy-arguments }} ${{ inputs.packages }}
       shell: bash
       name: Check with mypy
       working-directory: ${{ github.workspace }}