From ce28703ca0727ca29da24574af617a198e1ffe22 Mon Sep 17 00:00:00 2001 From: ModerRAS Date: Mon, 19 Oct 2026 21:14:49 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20PR/CI=20=E5=8C=85=E6=B3=A8=E5=85=A5=20Ban?= =?UTF-8?q?gumi=20OAuth=20=E5=87=AD=E8=AF=81=EF=BC=88Actions=20secrets?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - app/build.gradle.kts 从 gradle property / 环境变量读 BANGUMI_CLIENT_ID/SECRET,缺省空字符串(fork PR 照常编译, App 内报未配置而非炸构建) - build(debug APK)与 build-release 两个 job 均透传 secrets, debug 产物保留 7 天可直接装 HK1 联调 --- .github/workflows/ci.yml | 5 +++++ app/build.gradle.kts | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad647ba9..52ff7d66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,9 @@ jobs: run: chmod +x gradlew - name: Build debug APK + env: + BANGUMI_CLIENT_ID: ${{ secrets.BANGUMI_CLIENT_ID }} + BANGUMI_CLIENT_SECRET: ${{ secrets.BANGUMI_CLIENT_SECRET }} run: ./gradlew assembleDebug -PBUILD_NUMBER=${{ github.run_number }} --no-daemon --stacktrace - name: Run unit tests @@ -183,6 +186,8 @@ jobs: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + BANGUMI_CLIENT_ID: ${{ secrets.BANGUMI_CLIENT_ID }} + BANGUMI_CLIENT_SECRET: ${{ secrets.BANGUMI_CLIENT_SECRET }} - name: Generate update manifest run: | diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 425fd8a7..b5d33823 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,6 +43,17 @@ val releaseStoreFile = providers.environmentVariable("RELEASE_STORE_FILE") val releaseStorePassword = providers.environmentVariable("STORE_PASSWORD") val releaseKeyAlias = providers.environmentVariable("KEY_ALIAS") val releaseKeyPassword = providers.environmentVariable("KEY_PASSWORD") +// Bangumi OAuth app credentials (https://bgm.tv/dev/app). +// CI injects them from secrets; fork PRs get empty strings and the app +// reports OAuth "not configured" instead of failing the build. +// Local builds: -PBANGUMI_CLIENT_ID=.. or env BANGUMI_CLIENT_ID, or +// ~/.gradle/gradle.properties. Never commit real values. +val bangumiClientId = providers.gradleProperty("BANGUMI_CLIENT_ID").orNull.nonBlankOrNull() + ?: providers.environmentVariable("BANGUMI_CLIENT_ID").orNull.nonBlankOrNull() + ?: "" +val bangumiClientSecret = providers.gradleProperty("BANGUMI_CLIENT_SECRET").orNull.nonBlankOrNull() + ?: providers.environmentVariable("BANGUMI_CLIENT_SECRET").orNull.nonBlankOrNull() + ?: "" android { namespace = "com.miruplay.tv" @@ -53,6 +64,8 @@ android { versionName = appVersionName minSdk = 28 targetSdk = 35 + buildConfigField("String", "BANGUMI_CLIENT_ID", "\"$bangumiClientId\"") + buildConfigField("String", "BANGUMI_CLIENT_SECRET", "\"$bangumiClientSecret\"") ndk { abiFilters += listOf("arm64-v8a", "armeabi-v7a")