diff --git a/.github/workflows/formatter.yml b/.github/workflows/formatter.yml index 86bd3a76..94b739be 100644 --- a/.github/workflows/formatter.yml +++ b/.github/workflows/formatter.yml @@ -4,6 +4,9 @@ on: pull_request: push: +env: + SKIP: pylint + jobs: Formatter: runs-on: ubuntu-latest @@ -13,14 +16,8 @@ jobs: - uses: actions/checkout@v4.1.1 with: ref: ${{ github.head_ref }} - - uses: isort/isort-action@v1.1.0 - with: - configuration: "--settings-file=.isort.cfg" - requirements-files: "requirements.txt" - - uses: psf/black@stable - with: - options: "--line-length=120" - version: "24.2.0" + - uses: actions/setup-python@v5.0.0 + - uses: pre-commit/action@v3.0.1 - uses: stefanzweifel/git-auto-commit-action@v5.0.0 with: - commit_message: "Format code with isort and black" + commit_message: "Run formatters" diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml deleted file mode 100644 index 65080b90..00000000 --- a/.github/workflows/pre-commit.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: pre-commit - -on: - pull_request: - push: - -env: - SKIP: pylint - -jobs: - pre-commit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - - uses: actions/setup-python@v5.0.0 - - uses: pre-commit/action@v3.0.0