Change: Update CI workflows

* Use newest poetry version * Cache poetry installation * Use poetry to upload releases on pypi
greenbone · Apr 14, 2023 · 500d1f1 · 500d1f1
1 parent a10fabd
commit 500d1f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -6,9 +6,6 @@ on:
   pull_request:
     branches: [main]
 
-env:
-  POETRY_VERSION: "1.4.0"
-
 jobs:
   linting:
     name: Linting
@@ -26,7 +23,6 @@ jobs:
         with:
           packages: pontos tests scripts
           version: ${{ matrix.python-version }}
-          poetry-version: ${{ env.POETRY_VERSION }}
           cache: "true"
 
   test:
@@ -44,8 +40,8 @@ jobs:
         uses: greenbone/actions/poetry@v2
         with:
           version: ${{ matrix.python-version }}
-          poetry-version: ${{ env.POETRY_VERSION }}
           cache: "true"
+          cache-poetry-installation: "true"
       - name: Run unit tests
         run: poetry run python -m unittest
 
@@ -59,7 +55,6 @@ jobs:
         uses: greenbone/actions/coverage-python@v2
         with:
           version: "3.10"
-          poetry-version: ${{ env.POETRY_VERSION }}
           cache: "true"
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -71,8 +66,8 @@ jobs:
       - name: Install python, poetry and dependencies
         uses: greenbone/actions/poetry@v2
         with:
-          poetry-version: ${{ env.POETRY_VERSION }}
           cache: "true"
+          cache-poetry-installation: "true"
       - name: Check version
         run: |
           poetry run pontos-version verify current
diff --git a/.github/workflows/deploy-pypi.yml b/.github/workflows/deploy-pypi.yml
@@ -10,18 +10,14 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: greenbone/actions/poetry@v2
         with:
-          python-version: "3.10"
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade poetry
-          python -m pip install --upgrade twine
+          version: "3.10"
+          install-dependencies: "false"
+          cache-poetry-installation: "true"
       - name: Build and publish
         env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
         run: |
           poetry build
-          twine upload dist/*
+          poetry upload
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -32,8 +32,8 @@ jobs:
         uses: greenbone/actions/poetry@v2
         with:
           version: "3.10"
-          poetry-version: "1.4.0"
           cache: "true"
+          cache-poetry-installation: "true"
       - name: Build Documentation
         run: |
           cd docs && poetry run make html