fix(ci): use available Android SDK platform · openclaw/openclaw@33206ee

Recent Commits to openclaw:main

vincentkoc · 2026-06-23 · via Recent Commits to openclaw:main

File tree

- - src/main/java/ai/openclaw/app/gateway

Original file line number	Diff line number	Diff line change
`@@ -2233,7 +2233,7 @@ jobs:`
`2233`	`2233`	`uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5`
`2234`	`2234`	`with:`
`2235`	`2235`	`path: ~/.android-sdk`
`2236`		`-key: ${{ runner.os }}-android-sdk-v1-cmdline-14742923-platform-37.0-build-tools-36.0.0`
	`2236`	`+key: ${{ runner.os }}-android-sdk-v1-cmdline-14742923-platform-36-build-tools-36.0.0`
`2237`	`2237`	`restore-keys: \|`
`2238`	`2238`	`${{ runner.os }}-android-sdk-v1-`
`2239`	`2239`
`@@ -2263,7 +2263,7 @@ jobs:`
`2263`	`2263`	`yes \| sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses >/dev/null`
`2264`	`2264`	`sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --install \`
`2265`	`2265`	`"platform-tools" \`
`2266`		`- "platforms;android-37.0" \`
	`2266`	`+ "platforms;android-36" \`
`2267`	`2267`	`"build-tools;36.0.0"`
`2268`	`2268`
`2269`	`2269`	`- name: Run Android ${{ matrix.task }}`

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ plugins {`
`59`	`59`
`60`	`60`	`android {`
`61`	`61`	`namespace = "ai.openclaw.app"`
`62`		`- compileSdk = 37`
	`62`	`+ compileSdk = 36`
`63`	`63`
`64`	`64`	`// Release signing is local-only; keep the keystore path and passwords out of the repo.`
`65`	`65`	`signingConfigs {`

Original file line number	Diff line number	Diff line change
`@@ -49,18 +49,8 @@ import java.util.concurrent.Executors`
`49`	`49`	`import kotlin.coroutines.resume`
`50`	`50`	`import kotlin.coroutines.resumeWithException`
`51`	`51`
`52`		`-private fun createDnsResolver(context: Context): DnsResolver =`
`53`		`-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CINNAMON_BUN) {`
`54`		`- createContextDnsResolver(context)`
`55`		`- } else {`
`56`		`- createLegacyDnsResolver()`
`57`		`- }`
`58`		`-`
`59`		`-@RequiresApi(Build.VERSION_CODES.CINNAMON_BUN)`
`60`		`-private fun createContextDnsResolver(context: Context): DnsResolver = DnsResolver(context, null)`
`61`		`-`
`62`	`52`	`@Suppress("DEPRECATION")`
`63`		`-private fun createLegacyDnsResolver(): DnsResolver = DnsResolver.getInstance()`
	`53`	`+private fun createDnsResolver(): DnsResolver = DnsResolver.getInstance()`
`64`	`54`
`65`	`55`	`/**`
`66`	`56`	`* Watches local DNS-SD and optional wide-area DNS-SD for reachable OpenClaw gateways.`
`@@ -71,7 +61,7 @@ class GatewayDiscovery(`
`71`	`61`	`) {`
`72`	`62`	`private val nsd = context.getSystemService(NsdManager::class.java)`
`73`	`63`	`private val connectivity = context.getSystemService(ConnectivityManager::class.java)`
`74`		`-private val dns = createDnsResolver(context)`
	`64`	`+private val dns = createDnsResolver()`
`75`	`65`	`private val serviceType = "_openclaw-gw._tcp."`
`76`	`66`	`private val wideAreaDomain = System.getenv("OPENCLAW_WIDE_AREA_DOMAIN")`
`77`	`67`	`private val logTag = "OpenClaw/GatewayDiscovery"`

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`
`6`	`6`	`android {`
`7`	`7`	`namespace = "ai.openclaw.app.benchmark"`
`8`		`- compileSdk = 37`
	`8`	`+ compileSdk = 36`
`9`	`9`
`10`	`10`	`defaultConfig {`
`11`	`11`	`minSdk = 31`

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ androidx-activity = "1.13.0"`
`4`	`4`	`androidx-benchmark = "1.4.1"`
`5`	`5`	`androidx-camera = "1.6.0"`
`6`	`6`	`androidx-compose-bom = "2026.05.01"`
`7`		`-androidx-core = "1.19.0"`
	`7`	`+androidx-core = "1.18.0"`
`8`	`8`	`androidx-exifinterface = "1.4.2"`
`9`	`9`	`androidx-lifecycle = "2.10.0"`
`10`	`10`	`androidx-security = "1.1.0"`

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,14 @@ function readCriticalQualityWorkflow() {`
`23`	`23`	`return readFileSync(".github/workflows/codeql-critical-quality.yml", "utf8");`
`24`	`24`	`}`
`25`	`25`
	`26`	`+function readAndroidCompileSdk(path: string): number {`
	`27`	`+const match = readFileSync(path, "utf8").match(/^\scompileSdk\s=\s(\d+)\s$/mu);`
	`28`	`+if (!match) {`
	`29`	+throw new Error(`Missing compileSdk in ${path}`);
	`30`	`+}`
	`31`	`+return Number(match[1]);`
	`32`	`+}`
	`33`	`+`
`26`	`34`	`function findYamlFiles(directory: string): string[] {`
`27`	`35`	`return readdirSync(directory, { withFileTypes: true }).flatMap((entry) => {`
`28`	`36`	const path = `${directory}/${entry.name}`;
`@@ -134,6 +142,22 @@ describe("ci workflow guards", () => {`
`134`	`142`	`expect(workflow.jobs.android.strategy["max-parallel"]).toBe(2);`
`135`	`143`	`});`
`136`	`144`
	`145`	`+it("installs the Android SDK platform used by Gradle", () => {`
	`146`	`+const workflow = readCiWorkflow();`
	`147`	`+const appCompileSdk = readAndroidCompileSdk("apps/android/app/build.gradle.kts");`
	`148`	`+const benchmarkCompileSdk = readAndroidCompileSdk("apps/android/benchmark/build.gradle.kts");`
	`149`	`+const cacheStep = workflow.jobs.android.steps.find((step) => step.name === "Cache Android SDK");`
	`150`	`+const installStep = workflow.jobs.android.steps.find(`
	`151`	`+(step) => step.name === "Install Android SDK packages",`
	`152`	`+);`
	`153`	+const packageId = `platforms;android-${appCompileSdk}`;
	`154`	`+`
	`155`	`+expect(appCompileSdk).toBe(benchmarkCompileSdk);`
	`156`	+expect(cacheStep.with.key).toContain(`platform-${appCompileSdk}-`);
	`157`	+expect(installStep.run).toContain(`"${packageId}"`);
	`158`	+expect(installStep.run).not.toContain(`${packageId}.0`);
	`159`	`+});`
	`160`	`+`
`137`	`161`	`it("debounces canonical main pushes before Blacksmith admission", () => {`
`138`	`162`	`const workflow = readCiWorkflow();`
`139`	`163`	`const source = readFileSync(".github/workflows/ci.yml", "utf8");`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main

File tree