From 81669f07428102c6abb0f97261fa907bd2524018 Mon Sep 17 00:00:00 2001 From: Daniel Alome Date: Mon, 13 Jul 2026 13:19:57 +0100 Subject: [PATCH 1/2] ADFA-2522: Run spotlessCheck in CI after the APK build --- .github/workflows/debug.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index f330d8565f..b002989401 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -203,6 +203,13 @@ jobs: flox activate -d flox/base -- ./gradlew :app:assembleV8Debug --no-daemon echo "gradle_time_end=$(date +%s)" >> $GITHUB_ENV + - name: Run spotlessCheck + run: | + flox activate -d flox/base -- ./gradlew spotlessCheck --no-daemon || { + echo "::error::Spotless found formatting violations in this branch. Run './gradlew spotlessApply' locally, then commit and push the formatted files." + exit 1 + } + - name: Find APK file id: find_apk run: | From 94bb0a31e05c7c185b6c793e897ebc45495539b6 Mon Sep 17 00:00:00 2001 From: Daniel Alome Date: Mon, 13 Jul 2026 21:37:15 +0100 Subject: [PATCH 2/2] move spotless check a step up --- .github/workflows/debug.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index b002989401..e3f9f0ec34 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -197,12 +197,6 @@ jobs: run: | flox activate -d flox/base -- ./gradlew :plugin-api:apiCheck --no-daemon - - name: Assemble Universal APK - run: | - echo "gradle_time_start=$(date +%s)" >> $GITHUB_ENV - flox activate -d flox/base -- ./gradlew :app:assembleV8Debug --no-daemon - echo "gradle_time_end=$(date +%s)" >> $GITHUB_ENV - - name: Run spotlessCheck run: | flox activate -d flox/base -- ./gradlew spotlessCheck --no-daemon || { @@ -210,6 +204,13 @@ jobs: exit 1 } + - name: Assemble Universal APK + run: | + echo "gradle_time_start=$(date +%s)" >> $GITHUB_ENV + flox activate -d flox/base -- ./gradlew :app:assembleV8Debug --no-daemon + echo "gradle_time_end=$(date +%s)" >> $GITHUB_ENV + + - name: Find APK file id: find_apk run: |