diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre_commit.yml index c4697a965..6560e9226 100644 --- a/.github/workflows/pre_commit.yml +++ b/.github/workflows/pre_commit.yml @@ -2,8 +2,9 @@ name: Pre-commit on: workflow_dispatch: - schedule: - - cron: "0 0 * * 1" + push: + branches: + - main permissions: contents: read @@ -46,6 +47,15 @@ jobs: - run: pre-commit run --all-files -c .pre-commit-config.yaml continue-on-error: true + - name: Set up JDK + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 + with: + java-version: 17 + distribution: "temurin" + + - name: Build with Gradle + run: ./gradlew clean build + - name: git add run: | git add . diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ec2d837e2..e1de0c28b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.12.0 + rev: v0.12.7 hooks: - id: ruff args: @@ -22,7 +22,7 @@ repos: files: \.(html|css|js|py|md)$ exclude: (.vscode|.devcontainer|app/core/src/main/resources|app/proprietary/src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js) - repo: https://github.com/gitleaks/gitleaks - rev: v8.27.2 + rev: v8.28.0 hooks: - id: gitleaks - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/app/common/build.gradle b/app/common/build.gradle index 3c46a59af..515a52a5c 100644 --- a/app/common/build.gradle +++ b/app/common/build.gradle @@ -5,6 +5,7 @@ bootRun { spotless { java { target sourceSets.main.allJava + target sourceSets.test.allJava googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false) importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling") diff --git a/app/core/build.gradle b/app/core/build.gradle index d37ee9354..46aad111c 100644 --- a/app/core/build.gradle +++ b/app/core/build.gradle @@ -15,6 +15,7 @@ configurations { spotless { java { target sourceSets.main.allJava + target sourceSets.test.allJava googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false) importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling") diff --git a/app/proprietary/build.gradle b/app/proprietary/build.gradle index 2a72f8a65..467d8a138 100644 --- a/app/proprietary/build.gradle +++ b/app/proprietary/build.gradle @@ -7,6 +7,7 @@ bootRun { spotless { java { target sourceSets.main.allJava + target sourceSets.test.allJava googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false) importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling") diff --git a/build.gradle b/build.gradle index 7ec5d4e3c..ceb786ff0 100644 --- a/build.gradle +++ b/build.gradle @@ -530,9 +530,13 @@ launch4j { spotless { java { target sourceSets.main.allJava + target sourceSets.test.allJava target project(':common').sourceSets.main.allJava + target project(':common').sourceSets.test.allJava target project(':proprietary').sourceSets.main.allJava + target project(':proprietary').sourceSets.test.allJava target project(':stirling-pdf').sourceSets.main.allJava + target project(':stirling-pdf').sourceSets.test.allJava googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)