Skip to content

Commit

Permalink
Merge pull request #461 from Der-Henning/dev
Browse files Browse the repository at this point in the history
Bump Version 1.20.2
  • Loading branch information
Der-Henning authored Feb 7, 2024
2 parents 363b444 + 480357a commit 82a13d3
Show file tree
Hide file tree
Showing 15 changed files with 195 additions and 346 deletions.
6 changes: 3 additions & 3 deletions .github/actions/setup-poetry-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ inputs:
runs:
using: composite
steps:
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}
- if: ${{ inputs.poetry-version != 'latest' }}
Expand All @@ -35,12 +35,12 @@ runs:
poetry config virtualenvs.create true
poetry config virtualenvs.in-project true
poetry config installer.max-workers 1
- uses: actions/cache@v3
- uses: actions/cache@v4
if: inputs.without != '' && inputs.install-dependencies
with:
path: ./.venv
key: venv-without-${{ inputs.without }}-poetry-${{ inputs.poetry-version }}-python-${{ inputs.python-version }}-${{ hashFiles('poetry.lock') }}-${{ runner.os }}
- uses: actions/cache@v3
- uses: actions/cache@v4
if: inputs.without == '' && inputs.install-dependencies
with:
path: ./.venv
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
contents: read
security-events: write
steps:
- uses: actions/checkout@v3
- uses: github/codeql-action/init@v2
- uses: actions/checkout@v4
- uses: github/codeql-action/init@v3
with:
languages: python
- uses: github/codeql-action/analyze@v2
- uses: github/codeql-action/analyze@v3
37 changes: 37 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Dependabot Actions

permissions:
contents: write
pull-requests: write

on:
push:
branches:
- dependabot/pip/**
pull_request:
branches:
- dependabot/pip/**

env:
PYTHON_VERSION: '3.11'
POETRY_VERSION: 1.7.1

jobs:
run:
name: Update requirements.txt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
token: ${{ secrets.REPO_ACCESS_TOKEN }}
- uses: ./.github/actions/setup-poetry-action
with:
poetry-version: ${{ env.POETRY_VERSION }}
python-version: ${{ env.PYTHON_VERSION }}
install-dependencies: false
- name: Run poetry export
run: poetry export -f requirements.txt --output requirements.txt --without-hashes
- uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Update requirements.txt
branch: ${{ github.head_ref }}
4 changes: 2 additions & 2 deletions .github/workflows/publish-wiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
publish-wiki:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: impresscms-dev/strip-markdown-extensions-from-links-action@v1.0.0
- uses: actions/checkout@v4
- uses: impresscms-dev/strip-markdown-extensions-from-links-action@v1
with:
path: wiki
- uses: Andrew-Chen-Wang/github-wiki-action@v4
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
file: ./docker/Dockerfile.alpine
context: ./
steps:
- uses: actions/checkout@v3
- uses: docker/metadata-action@v4
- uses: actions/checkout@v4
- uses: docker/metadata-action@v5
id: meta
with:
images: ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}
Expand All @@ -49,10 +49,10 @@ jobs:
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
id: buildx
- uses: docker/build-push-action@v3
- uses: docker/build-push-action@v5
with:
context: ${{ matrix.context }}
file: ${{ matrix.file }}
Expand All @@ -79,7 +79,7 @@ jobs:
MINOR_VERSION
input-files: |
./docker/DOCKER_README.md
- uses: peter-evans/dockerhub-description@v3
- uses: peter-evans/dockerhub-description@v4
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
with:
username: ${{ secrets.DOCKER_USERNAME }}
Expand All @@ -102,7 +102,7 @@ jobs:
- os: macos-latest
tag: macos
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-poetry-action
with:
poetry-version: ${{ env.POETRY_VERSION }}
Expand All @@ -126,9 +126,9 @@ jobs:
if: matrix.tag == 'win'
run: Compress-Archive ./dist/* ./${{ steps.filename.outputs.FILENAME }}
- name: Upload archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: releases-${{github.sha}}
name: releases-${{ matrix.tag }}-${{ github.sha }}
path: ./${{ steps.filename.outputs.FILENAME }}
- name: Add archive to release
uses: softprops/action-gh-release@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]
python: ['3.9', '3.10', '3.11', '3.12']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-poetry-action
with:
poetry-version: ${{ env.POETRY_VERSION }}
python-version: ${{ matrix.python }}
without: build
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/pre-commit
key: pre-commit-python-${{ matrix.python }}-${{ hashFiles('poetry.lock', '.pre-commit-config.yaml') }}-${{ runner.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tgtg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Run Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-poetry-action
with:
poetry-version: ${{ env.POETRY_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ repos:
- id: poetry-lock
args: [--no-update]
- id: poetry-export
args: [-f, requirements.txt, -o, requirements.txt]
args: [-f, requirements.txt, -o, requirements.txt, --without-hashes]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
worker: python src/main.py
worker: python -m tgtg_scanner
Loading

0 comments on commit 82a13d3

Please sign in to comment.