diff --git a/.gitea/workflows/android-release-signed.yml b/.gitea/workflows/android-release-signed.yml index 4ab5c2f..2893325 100644 --- a/.gitea/workflows/android-release-signed.yml +++ b/.gitea/workflows/android-release-signed.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Setup Java 17 + - name: Setup Java 21 run: | export JAVA_HOME=/usr/lib/jvm/java-21-openjdk export PATH=$JAVA_HOME/bin:$PATH @@ -31,7 +31,7 @@ jobs: - name: Build Signed Release APK env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + KEY_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} run: | echo '=== 编译签名 Release APK ===' @@ -41,11 +41,9 @@ jobs: export CUSTOM_AAPT2_PATH=/usr/bin/aapt2 # 创建 gradle.properties - cat >> gradle.properties << EOF -android.aapt2FromMavenOverride=$CUSTOM_AAPT2_PATH -org.gradle.daemon=false -org.gradle.jvmargs=-Xmx2g -EOF + echo "android.aapt2FromMavenOverride=$CUSTOM_AAPT2_PATH" > gradle.properties + echo "org.gradle.daemon=false" >> gradle.properties + echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties # 创建签名配置 cat > app/signing-config.gradle << 'EOF' @@ -70,9 +68,9 @@ android { } EOF - # 在 app/build.gradle 中应用签名配置(如果还没有) + # 在 app/build.gradle 中应用签名配置 if ! grep -q 'signing-config.gradle' app/build.gradle; then - sed -i '1i apply from: '"'"'signing-config.gradle'"'"'' app/build.gradle + sed -i "1i apply from: 'signing-config.gradle'" app/build.gradle fi echo '开始编译...' @@ -97,13 +95,7 @@ EOF 'https://gitea.kg8.net/api/v1/repos/${{ github.repository }}/releases' \ -H 'Authorization: token ${{ secrets.ACTIONS_TOKEN }}' \ -H 'Content-Type: application/json' \ - -d "{ - \\\"tag_name\\\": \\\"$VERSION\\\", - \\\"name\\\": \\\"Release $VERSION\\\", - \\\"body\\\": \\\"## 自动发布的签名版本\\n\\n- ✅ 已签名,可安装到真机\\n- 🔐 使用开发者证书签名\\n- 🚀 自动编译\\\", - \\\"draft\\\": false, - \\\"prerelease\\\": false - }") + -d "{\"tag_name\": \"$VERSION\", \"name\": \"Release $VERSION\", \"body\": \"## 自动发布的签名版本\\n\\n- ✅ 已签名\\n- 🔐 开发者证书签名\", \"draft\": false, \"prerelease\": false}") UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d'"' -f4) @@ -137,4 +129,4 @@ EOF app/build/outputs/apk/release/${{ env.APK_NAME }} echo '' - echo '✅ 签名验证通过!此 APK 可以安装到真机。' + echo '✅ 签名验证通过!'