Skip to content

Commit

Permalink
Change: Use generic reusable workflows
Browse files Browse the repository at this point in the history
Use our new generic reusable workflows where possible.
  • Loading branch information
bjoernricks committed May 19, 2023
1 parent 61e110d commit 742d845
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 81 deletions.
44 changes: 16 additions & 28 deletions .github/workflows/ci-python.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
name: Build and test
name: Check and test

on:
push:
branches: [main]
branches:
- main
pull_request:
branches: [main]

jobs:
linting:
name: Linting
runs-on: "ubuntu-latest"
strategy:
matrix:
python-version:
Expand All @@ -18,19 +17,13 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
steps:
- uses: actions/checkout@v3
- name: Check with black, pylint and pontos.version
uses: greenbone/actions/lint-python@v2
with:
packages: gvm tests
version: ${{ matrix.python-version }}
poetry-version: "1.4.0"
cache: "true"
uses: greenbone/workflows/.github/workflows/lint-python.yml@main
with:
lint-packages: gvm tests
python-version: ${{ matrix.python-version }}

test:
name: Unit tests
runs-on: "ubuntu-latest"
name: Run tests
strategy:
matrix:
python-version:
Expand All @@ -39,16 +32,9 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
steps:
- uses: actions/checkout@v3
- name: Install poetry and dependencies
uses: greenbone/actions/poetry@v2
with:
version: ${{ matrix.python-version }}
poetry-version: "1.4.0"
cache: "true"
- name: Run unit tests
run: poetry run python -m unittest
uses: greenbone/workflows/.github/workflows/test-python.yml@main
with:
python-version: ${{ matrix.python-version }}

codecov:
name: Upload coverage to codecov.io
Expand All @@ -59,8 +45,7 @@ jobs:
- name: Calculate and upload coverage to codecov.io
uses: greenbone/actions/coverage-python@v2
with:
version: "3.10"
poetry-version: "1.4.0"
python-version: "3.10"
cache: "true"

build-docs:
Expand All @@ -71,9 +56,12 @@ jobs:
- name: Install poetry and dependencies
uses: greenbone/actions/poetry@v2
with:
poetry-version: "1.4.0"
cache: "true"
- name: Build docs
run: |
cd docs
poetry run make html
versioning:
name: Check versioning
uses: greenbone/workflows/.github/workflows/check-version.yml@main
8 changes: 2 additions & 6 deletions .github/workflows/deploy-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 1 addition & 22 deletions .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,4 @@ concurrency:

jobs:
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install poetry and dependencies
uses: greenbone/actions/poetry@v2
with:
poetry-version: "1.4.0"
cache: "true"
- name: Build Documentation
run: |
cd docs && poetry run make html
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: "docs/build/html"
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: greenbone/workflows/.github/workflows/docs-python.yml@main
29 changes: 4 additions & 25 deletions .github/workflows/release-pontos.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release Python package with pontos
name: Release Python package

on:
pull_request:
Expand All @@ -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

0 comments on commit 742d845

Please sign in to comment.