From: Marc Fehling Date: Wed, 12 Feb 2025 11:08:30 +0000 (+0100) Subject: Move pre-commit check to indent.yml file. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b94ef512de6e2713f542360ba3fd01b70f5c989d;p=dealii.git Move pre-commit check to indent.yml file. --- diff --git a/.github/workflows/indent.yml b/.github/workflows/indent.yml index ec8d203abc..faedc97ee7 100644 --- a/.github/workflows/indent.yml +++ b/.github/workflows/indent.yml @@ -9,9 +9,6 @@ concurrency: permissions: contents: read -env: - MAKEFLAGS: "--jobs=4" - jobs: indent: # run the indent checks @@ -36,6 +33,9 @@ jobs: name: doxygen runs-on: ubuntu-24.04 + env: + MAKEFLAGS: "--jobs=4" + steps: - name: setup run: | @@ -68,3 +68,18 @@ jobs: with: name: doxygen_documentation path: build/doc/doxygen + + pre-commit: + # run pre-commit checks + + name: pre-commit + runs-on: ubuntu-24.04 + + env: + SKIP: clang-format, no-commit-to-branch + + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + - run: python -m pip install networkx + - uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml deleted file mode 100644 index 02028cc32c..0000000000 --- a/.github/workflows/pre-commit.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: pre-commit - -on: [push, pull_request] -concurrency: - group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{github.event_name == 'pull_request'}} -permissions: - contents: read - -env: - SKIP: clang-format, no-commit-to-branch - -jobs: - pre-commit: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - - run: python -m pip install networkx - - uses: pre-commit/action@v3.0.1