Skip to content

Commit f095e80

Browse files
committed
pref(ci): don't build 'Play' for lint
`lintVitalFullRelease` was copied from the publish script, `lintFullDebug` will find the same issues, so just call it Assisted-by: Claude Opus 4.7 - confirmation of correctness
1 parent 50115d2 commit f095e80

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

.github/workflows/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ following scripts before submitting a PR.
1111

1212
Alternately, you may run the actions on your fork of `Anki-Android`.
1313

14-
| **Job** | **Command** | **Comments** |
15-
|------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|-----------------------------------------------------------|
16-
| [Lint (Kotlin)](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/lint.yml) | `./gradlew lintAll ktLintCheck lintVitalFullRelease lint-rules:test --daemon` | Android lint rules, formatting and tests for lint rules |
17-
| [Lint (JavaScript)](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/lint.yml) | See script | Prettier, lint & code formatting |
18-
| [Unit Tests](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/tests_unit.yml) | `./gradlew jacocoUnitTestReport --daemon` | Unit tests for the Android Project |
19-
| [Emulator Tests](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/tests_emulator.yml) | `TEST_RELEASE_BUILD=true ./gradlew jacocoAndroidTestReport --daemon` | Emulator tests for the Android Project |
20-
| [CodeQL](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/codeql.yml) | N/A | GitHub-only check.<br/>[Docs](https://codeql.github.com/) |
14+
| **Job** | **Command** | **Comments** |
15+
|------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------|-----------------------------------------------------------|
16+
| [Lint (Kotlin)](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/lint.yml) | `./gradlew lintAll ktLintCheck lint-rules:test --daemon` | Android lint rules, formatting and tests for lint rules |
17+
| [Lint (JavaScript)](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/lint.yml) | See script | Prettier, lint & code formatting |
18+
| [Unit Tests](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/tests_unit.yml) | `./gradlew jacocoUnitTestReport --daemon` | Unit tests for the Android Project |
19+
| [Emulator Tests](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/tests_emulator.yml) | `TEST_RELEASE_BUILD=true ./gradlew jacocoAndroidTestReport --daemon` | Emulator tests for the Android Project |
20+
| [CodeQL](https://github.com/ankidroid/Anki-Android/blob/main/.github/workflows/codeql.yml) | N/A | GitHub-only check.<br/>[Docs](https://codeql.github.com/) |
2121

2222
## Other Workflows
2323

.github/workflows/lint.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ jobs:
5353
command: ./gradlew :AnkiDroid:compilePlayDebugJavaWithJavac compileLint lint-rules:compileTestJava --daemon
5454

5555
- name: Run Lint Debug
56-
# "lintAll" opts in all modules in 1 flavor to lint, pinning :AnkiDroid to lintPlayDebug
57-
# "lintVitalFullRelease": if `main` resources are only used in `androidTest` (#15741)
56+
# "lintAll" opts in all modules in 1 flavor to lint, pinning :AnkiDroid to lintFullDebug
5857
# update workflows/README.md when modifying this line
59-
run: ./gradlew lintAll ktLintCheck lintVitalFullRelease lint-rules:test --daemon
58+
run: ./gradlew lintAll ktLintCheck lint-rules:test --daemon
6059

6160
# update workflows/README.md when modifying commands
6261
lintJavascript:

build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,13 @@ subprojects {
135135
}
136136
}
137137

138-
// Opt all modules in to lint (with :AnkiDroid pinned to one flavor: 'Play')
138+
// Opt all modules in to lint (with :AnkiDroid pinned to one flavor: 'Full')
139139
val lintAll = tasks.register("lintAll") {
140140
group = "verification"
141141
description = "Runs lint on every module."
142-
dependsOn(":AnkiDroid:lintPlayDebug") // specify 'Play' explicitly so other flavors don't run
142+
// specify 'Full' explicitly so other flavors don't run
143+
// 'full' has no Manifest changes, so catches more unused references (#15741)
144+
dependsOn(":AnkiDroid:lintFullDebug")
143145
}
144146

145147
subprojects {

0 commit comments

Comments
 (0)