Change: Use generic reusable workflows

Use our new generic reusable workflows where possible.
greenbone · May 30, 2023 · b51a6a7 · b51a6a7
1 parent 9000ba9
commit b51a6a7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 81 deletions.
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -7,9 +7,7 @@ on:
     branches: [main]
 
 jobs:
-  linting:
-    name: Linting
-    runs-on: "ubuntu-latest"
+  check-and-test:
     strategy:
       matrix:
         python-version:
@@ -18,60 +16,23 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: greenbone/actions/lint-python@v2
-        with:
-          packages: autohooks tests
-          python-version: ${{ matrix.python-version }}
-
-  type-checking:
-    name: Type-checker
-    runs-on: 'ubuntu-latest'
-    strategy:
-        matrix:
-          python-version:
-            - "3.7"
-            - "3.8"
-            - "3.9"
-            - "3.10"
-            - "3.11"
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: greenbone/actions/mypy-python@v2
-        with:
-          packages: autohooks
-          python-version: ${{ matrix.python-version }}
-
-  test:
-    name: Run all tests
-    runs-on: "ubuntu-latest"
-    strategy:
-      matrix:
-        python-version:
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install poetry and dependencies
-        uses: greenbone/actions/poetry@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Run unit tests
-        run: poetry run python -m unittest
+    name: Check and test
+    uses: greenbone/workflows/.github/workflows/ci-python.yml@main
+    with:
+      lint-packages: autohooks tests
+      python-version: ${{ matrix.python-version }}
 
   codecov:
     name: Upload coverage to codecov.io
-    needs: test
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v3
       - name: Calculate and upload coverage to codecov.io
         uses: greenbone/actions/coverage-python@v2
         with:
           python-version: "3.10"
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  check-version:
+    name: Check versioning for consistency
+    uses: greenbone/workflows/.github/workflows/check-version.yml@main
diff --git a/.github/workflows/deploy-pypi.yml b/.github/workflows/deploy-pypi.yml
@@ -6,9 +6,5 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Build and publish to PyPI
-        uses: greenbone/actions/pypi-upload@v2
-        with:
-          pypi-token: ${{ secrets.PYPI_TOKEN }}
+    uses: greenbone/workflows/.github/workflows/deploy-pypi.yml@main
+    secrets: inherit
diff --git a/.github/workflows/release-pontos.yml b/.github/workflows/release-pontos.yml
@@ -1,4 +1,4 @@
-name: Release Python package with pontos
+name: Release Python package
 
 on:
   pull_request:
@@ -7,27 +7,6 @@ on:
 
 jobs:
   build-and-release:
-    name: Create a new release with pontos
-    # If the event is a workflow_dispatch or the label 'make release' is set and PR is closed because of a merge
-    if: (github.event_name == 'workflow_dispatch') || (contains( github.event.pull_request.labels.*.name, 'make release') && github.event.pull_request.merged == true)
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: Setting the Reference
-        run: |
-          if [[ "${{ github.event_name }}" = "workflow_dispatch" ]]; then
-            echo "RELEASE_REF=${{ github.ref_name }}" >> $GITHUB_ENV
-          else
-            echo "RELEASE_REF=${{ github.base_ref }}" >> $GITHUB_ENV
-          fi
-      - name: Release with release action
-        uses: greenbone/actions/release@v2
-        with:
-          conventional-commits: true
-          github-user: ${{ secrets.GREENBONE_BOT }}
-          github-user-mail: ${{ secrets.GREENBONE_BOT_MAIL }}
-          github-user-token: ${{ secrets.GREENBONE_BOT_TOKEN }}
-          gpg-key: ${{ secrets.GPG_KEY }}
-          gpg-fingerprint: ${{ secrets.GPG_FINGERPRINT }}
-          gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          strategy: calendar
-          ref: ${{ env.RELEASE_REF }}
+    name: Create a new release
+    uses: greenbone/workflows/.github/workflows/release-python.yml@main
+    secrets: inherit
diff --git a/pyproject.toml b/pyproject.toml
@@ -79,3 +79,7 @@ line_length = 80
 
 [tool.pontos.version]
 version-module-file = "autohooks/plugins/mypy/__version__.py"
+
+[tool.mypy]
+files = "autohooks"
+ignore_missing_imports = true