fix: 简化 workflow,避免 heredoc 问题

This commit is contained in:
CI Bot
2026-06-02 18:55:07 +08:00
parent 7e6e95d212
commit defbbec0cf
+59 -67
View File
@@ -28,55 +28,64 @@ jobs:
echo '✅ 证书已解压'
ls -lh app/release.keystore
- name: Setup Gradle Properties
run: |
echo '=== 创建 gradle.properties ==='
export CUSTOM_AAPT2_PATH=/usr/bin/aapt2
echo "android.aapt2FromMavenOverride=$CUSTOM_AAPT2_PATH" > gradle.properties
echo "org.gradle.daemon=false" >> gradle.properties
echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties
cat gradle.properties
- name: Setup Signing Config
run: |
echo '=== 创建签名配置 ==='
echo 'android {' > app/signing-config.gradle
echo ' signingConfigs {' >> app/signing-config.gradle
echo ' release {' >> app/signing-config.gradle
echo " storeFile file('release.keystore')" >> app/signing-config.gradle
echo " storePassword System.getenv('KEYSTORE_PASSWORD')" >> app/signing-config.gradle
echo " keyAlias System.getenv('KEY_ALIAS')" >> app/signing-config.gradle
echo " keyPassword System.getenv('KEY_PASSWORD')" >> app/signing-config.gradle
echo ' v1SigningEnabled true' >> app/signing-config.gradle
echo ' v2SigningEnabled true' >> app/signing-config.gradle
echo ' }' >> app/signing-config.gradle
echo ' }' >> app/signing-config.gradle
echo ' buildTypes {' >> app/signing-config.gradle
echo ' release {' >> app/signing-config.gradle
echo ' signingConfig signingConfigs.release' >> app/signing-config.gradle
echo ' minifyEnabled false' >> app/signing-config.gradle
echo ' shrinkResources false' >> app/signing-config.gradle
echo ' }' >> app/signing-config.gradle
echo ' }' >> app/signing-config.gradle
echo '}' >> app/signing-config.gradle
echo '✅ 签名配置已创建'
cat app/signing-config.gradle
- name: Apply Signing Config
run: |
echo '=== 应用签名配置到 build.gradle ==='
if ! grep -q 'signing-config.gradle' app/build.gradle; then
sed -i "1i apply from: 'signing-config.gradle'" app/build.gradle
echo '✅ 签名配置已应用'
else
echo '⚠️ 签名配置已存在'
fi
head -5 app/build.gradle
- name: Build Signed Release APK
env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
run: |
echo '=== 编译签名 Release APK ==='
export ANDROID_HOME=/opt/android-sdk
export ANDROID_SDK_ROOT=$ANDROID_HOME
export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH
export CUSTOM_AAPT2_PATH=/usr/bin/aapt2
# 创建 gradle.properties
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'
android {
signingConfigs {
release {
storeFile file('release.keystore')
storePassword System.getenv('KEYSTORE_PASSWORD')
keyAlias System.getenv('KEY_ALIAS')
keyPassword System.getenv('KEY_PASSWORD')
v1SigningEnabled true
v2SigningEnabled true
}
}
buildTypes {
release {
signingConfig signingConfigs.release
minifyEnabled false
shrinkResources false
}
}
}
EOF
# 在 app/build.gradle 中应用签名配置
if ! grep -q 'signing-config.gradle' app/build.gradle; then
sed -i "1i apply from: 'signing-config.gradle'" app/build.gradle
fi
echo '开始编译...'
gradle assembleRelease --no-daemon --stacktrace
# 重命名 APK
VERSION=${GITHUB_REF#refs/tags/}
cp app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/app-${VERSION}-signed.apk
echo 'APK_NAME=app-'"${VERSION}"'-signed.apk' >> $GITHUB_ENV
@@ -86,47 +95,30 @@ EOF
ls -lh app/build/outputs/apk/release/
- name: Create Gitea Release
id: create_release
run: |
echo '=== 创建 Gitea Release ==='
VERSION=${GITHUB_REF#refs/tags/}
RESPONSE=$(curl -s -X POST \
'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- 🔐 开发者证书签名\", \"draft\": false, \"prerelease\": false}")
curl -s -X POST \
"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- 🔐 开发者证书签名\",\"draft\":false,\"prerelease\":false}"
UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d'"' -f4)
if [ -n "$UPLOAD_URL" ]; then
echo "UPLOAD_URL=$UPLOAD_URL" >> $GITHUB_ENV
echo '✅ Release 创建成功'
else
echo '❌ 创建 Release 失败'
echo "响应:$RESPONSE"
exit 1
fi
echo ''
echo '✅ Release 创建完成'
- name: Upload Signed APK
run: |
echo '=== 上传签名 APK ==='
echo 'APK: ${{ env.APK_NAME }}'
echo 'Upload URL: ${{ env.UPLOAD_URL }}'
VERSION=${GITHUB_REF#refs/tags/}
curl -s -X POST '${{ env.UPLOAD_URL }}?name=${{ env.APK_NAME }}' \
-H 'Authorization: token ${{ secrets.ACTIONS_TOKEN }}' \
-H 'Content-Type: application/vnd.android.package-archive' \
--data-binary '@app/build/outputs/apk/release/${{ env.APK_NAME }}'
curl -s -X POST \
"https://gitea.kg8.net/api/v1/repos/${{ github.repository }}/releases/assets?name=${{ env.APK_NAME }}" \
-H "Authorization: token ${{ secrets.ACTIONS_TOKEN }}" \
-H "Content-Type: application/vnd.android.package-archive" \
--data-binary "@app/build/outputs/apk/release/${{ env.APK_NAME }}"
echo ''
echo '✅ APK 上传成功!'
- name: Verify Signature
run: |
echo '=== 验证 APK 签名 ==='
$ANDROID_HOME/build-tools/34.0.0/apksigner verify --print-certs \
app/build/outputs/apk/release/${{ env.APK_NAME }}
echo ''
echo '✅ 签名验证通过!'