From ea04da86c47d96f4a0c6c04770a4c7de60142ff1 Mon Sep 17 00:00:00 2001 From: "Takahashi.Hiroyuki" Date: Wed, 1 Apr 2026 17:52:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?spotless=E5=AE=9F=E8=A1=8C=E6=99=82?= =?UTF-8?q?=E3=81=AB=E3=80=81=E6=AF=94=E8=BC=83=E5=AF=BE=E8=B1=A1=E3=83=96?= =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 6d846c870..3b964c3bf 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,11 @@ allprojects { apply plugin: 'com.diffplug.spotless' spotless { + def diffBase = findProperty('diffBase') + + if (diffBase) { + ratchetFrom diffBase + } java { eclipse().configFile("${rootDir}/editor-settings/iplass-codestyle-eclipse/eclipse-java-formatter.xml") importOrder( 'javax', 'java', 'org' , "") From 2b8093ba9e3c3802070f9bf98c3c1d529bba482e Mon Sep 17 00:00:00 2001 From: "Takahashi.Hiroyuki" Date: Wed, 1 Apr 2026 17:53:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?GitHub=20Actions=20=E9=AB=98=E9=80=9F?= =?UTF-8?q?=E5=8C=96=EF=BC=9A=E5=B7=AE=E5=88=86=E3=81=AE=E3=81=BF=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/java-format-check.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java-format-check.yml b/.github/workflows/java-format-check.yml index b3b93a089..825611d33 100644 --- a/.github/workflows/java-format-check.yml +++ b/.github/workflows/java-format-check.yml @@ -21,6 +21,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 @@ -35,4 +37,9 @@ jobs: run: chmod +x gradlew - name: Run Spotless Check - run: ./gradlew spotlessCheck --no-daemon + run: | + if [ -n "${{github.base_ref}}" ]; then + ./gradlew spotlessCheck --no-daemon -PdiffBase=origin/${{github.base_ref}} + else + ./gradlew spotlessCheck --no-daemon + fi