diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 306e6838f..418d89757 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,6 +90,8 @@ jobs: restore-keys: cmake-default- - name: Build + env: + GITHUB_TOKEN: ${{ secrets.GithubToken }} run: ./gradlew assembleDefaultRelease - name: Upload ARM64 @@ -161,6 +163,8 @@ jobs: restore-keys: cmake-marshmallow- - name: Build + env: + GITHUB_TOKEN: ${{ secrets.GithubToken }} run: ./gradlew assembleMarshmallowRelease - name: Upload ARM64 diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index fbeee9aa3..3b2af564b 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -38,6 +38,8 @@ jobs: - name: Gradle Build uses: gradle/actions/setup-gradle@v3 + env: + GITHUB_TOKEN: ${{ secrets.GithubToken }} with: arguments: assembleRelease diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 298f33576..b574c6f1b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,4 @@ +import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties import com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE import com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP @@ -63,6 +64,9 @@ android { val chromeVersion = rootProject.layout.projectDirectory.file("chrome-for-testing/LATEST_RELEASE_STABLE").asFile .readText().substringBefore('.') + val githubToken = gradleLocalProperties(rootDir, providers)["GITHUB_TOKEN"] as? String + ?: System.getenv("GITHUB_TOKEN").orEmpty() + defaultConfig { applicationId = "moe.tarsin.ehviewer" minSdk = 26 @@ -91,6 +95,7 @@ android { buildConfigField("long", "COMMIT_TIME", commitTime) buildConfigField("String", "REPO_NAME", "\"$repoName\"") buildConfigField("String", "CHROME_VERSION", "\"$chromeVersion\"") + buildConfigField("String", "GITHUB_TOKEN", "\"$githubToken\"") ndk { if (isRelease) { abiFilters.addAll(supportedAbis) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/updater/AppUpdater.kt b/app/src/main/kotlin/com/hippo/ehviewer/updater/AppUpdater.kt index efb9edcc2..f69ca410b 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/updater/AppUpdater.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/updater/AppUpdater.kt @@ -13,8 +13,6 @@ import io.ktor.client.statement.bodyAsText import io.ktor.utils.io.jvm.javaio.toInputStream import java.io.File import java.util.zip.ZipInputStream -import kotlin.io.encoding.Base64 -import kotlin.io.encoding.ExperimentalEncodingApi import kotlin.time.Duration.Companion.days import kotlinx.datetime.Clock import kotlinx.datetime.Instant @@ -85,12 +83,8 @@ object AppUpdater { } } -@OptIn(ExperimentalEncodingApi::class) private suspend inline fun ghStatement(url: String) = ktorClient.prepareGet(url) { - val token = "github_" + "pat_11AXZS" + "T4A0k3TArCGakP3t_7DzUE5S" + "mr1zw8rmmzVtCeRq62" + "A4qkuDMw6YQm5ZUtHSLZ2MLI3J4VSifLXZ" - val user = "nullArrayList" - val base64 = Base64.encode("$user:$token".toByteArray()) - header("Authorization", "Basic $base64") + header("Authorization", "Bearer ${BuildConfig.GITHUB_TOKEN}") } data class Release(