初步用Compose重构关于界面
增加了以后会使用的一些自定义Compose控件 尝试让机器人自动发布预发布版本 修复透明模式下搜索框"删除所有"文字不明显 #354 忙忙忙咩咩咩咩
This commit is contained in:
HapeLee
+152
-58
@@ -33,23 +33,67 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ !startsWith(github.event.head_commit.message, 'Merge pull request') }}
|
||||
outputs:
|
||||
version: ${{ steps.set-ver.outputs.version }}
|
||||
versionL: ${{ steps.set-ver.outputs.versionL }}
|
||||
lanzou: ${{ steps.check.outputs.lanzou }}
|
||||
telegram: ${{ steps.check.outputs.telegram }}
|
||||
# versionL: 完整版本号，例如 3.26.3-beta.1
|
||||
versionL: ${{ steps.set-ver.outputs.full_version_name }}
|
||||
# version: 基础版本号，例如 3.26.3
|
||||
version: ${{ steps.set-ver.outputs.current_version }}
|
||||
# build_number: 增量构建号，例如 1
|
||||
build_number: ${{ steps.set-ver.outputs.build_number }}
|
||||
# latest_tag: 最近一个用于版本递增的 tag，例如 v3.26.2-beta.5
|
||||
latest_tag: ${{ steps.set-ver.outputs.last_tag }}
|
||||
steps:
|
||||
- id: set-ver
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
# 确保拉取所有标签，用于版本号计算
|
||||
fetch-depth: 0
|
||||
|
||||
- name: 计算版本号和构建号
|
||||
id: set-ver
|
||||
run: |
|
||||
echo "version=$(date -d "8 hour" -u +3.%y.%m%d%H)" >> $GITHUB_OUTPUT
|
||||
echo "versionL=$(date -d "8 hour" -u +3.%y.%m%d%H%M)" >> $GITHUB_OUTPUT
|
||||
- id: check
|
||||
run: |
|
||||
if [ ${{ secrets.LANZOU_ID }} ]; then
|
||||
echo "lanzou=yes" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
if [ ${{ secrets.BOT_TOKEN }} ]; then
|
||||
echo "telegram=yes" >> $GITHUB_OUTPUT
|
||||
# 1. 读取 version.properties 文件获取基础版本号
|
||||
MAJOR=$(grep 'VERSION_MAJOR' version.properties | cut -d'=' -f2)
|
||||
MINOR=$(grep 'VERSION_MINOR' version.properties | cut -d'=' -f2)
|
||||
PATCH=$(grep 'VERSION_PATCH' version.properties | cut -d'=' -f2)
|
||||
CURRENT_VERSION="$MAJOR.$MINOR.$PATCH"
|
||||
|
||||
# 2. 尝试获取最近一次成功的构建号 (beta build number)
|
||||
# 查找最近的、格式为 vX.Y.Z-beta.N 的标签，且 X.Y.Z 部分与当前版本匹配
|
||||
# 只有在推送到 main 分支时才进行自增计算
|
||||
if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
|
||||
LAST_TAG=$(git tag --list "v*.*.*-beta.*" --sort=-committerdate | head -n 1)
|
||||
|
||||
# 查找匹配当前 CURRENT_VERSION 的上一个 TAG
|
||||
LAST_MATCHING_TAG=$(git tag --list "v$CURRENT_VERSION-beta.*" --sort=-committerdate | head -n 1)
|
||||
|
||||
if [[ $LAST_MATCHING_TAG =~ v[0-9]+\.[0-9]+\.[0-9]+-beta\.([0-9]+) ]]; then
|
||||
# 如果找到匹配当前 PATCH 版本的 beta 标签，则递增
|
||||
LAST_BUILD_NUM="${BASH_REMATCH[1]}"
|
||||
NEW_BUILD_NUM=$((LAST_BUILD_NUM + 1))
|
||||
LAST_TAG_FOR_LOG="$LAST_MATCHING_TAG"
|
||||
echo "版本 $CURRENT_VERSION 未变更，构建号自增：$LAST_BUILD_NUM -> $NEW_BUILD_NUM"
|
||||
else
|
||||
# 如果找不到匹配的标签 (可能是 PATCH 刚修改，或首次构建)，则重置为 1
|
||||
NEW_BUILD_NUM=1
|
||||
# 如果是 PATCH 首次构建，则使用仓库中最近的那个 tag 作为日志起点
|
||||
LAST_TAG_FOR_LOG="$LAST_TAG"
|
||||
echo "版本 $CURRENT_VERSION 为新版本或首次构建，构建号重置为 $NEW_BUILD_NUM"
|
||||
fi
|
||||
else
|
||||
# 对于 PR 或其他分支，使用一个固定的构建号 0
|
||||
NEW_BUILD_NUM=0
|
||||
LAST_TAG_FOR_LOG=$(git tag --sort=-committerdate | head -n 1)
|
||||
echo "非 main 分支推送，构建号设置为 $NEW_BUILD_NUM"
|
||||
fi
|
||||
|
||||
# 3. 构造最终版本信息
|
||||
VERSION_SUFFIX_NAME="-beta.$NEW_BUILD_NUM"
|
||||
FULL_VERSION_NAME="${CURRENT_VERSION}${VERSION_SUFFIX_NAME}"
|
||||
|
||||
# 4. 设置输出供后续作业使用
|
||||
echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
|
||||
echo "full_version_name=$FULL_VERSION_NAME" >> $GITHUB_OUTPUT
|
||||
echo "build_number=$NEW_BUILD_NUM" >> $GITHUB_OUTPUT
|
||||
echo "last_tag=$LAST_TAG_FOR_LOG" >> $GITHUB_OUTPUT
|
||||
|
||||
build:
|
||||
needs: prepare
|
||||
@@ -62,8 +106,10 @@ jobs:
|
||||
env:
|
||||
product: ${{ matrix.product }}
|
||||
type: ${{ matrix.type }}
|
||||
# 使用 prepare job 的输出
|
||||
VERSION: ${{ needs.prepare.outputs.version }}
|
||||
VERSIONL: ${{ needs.prepare.outputs.versionL }}
|
||||
BUILD_NUMBER: ${{ needs.prepare.outputs.build_number }}
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
with:
|
||||
@@ -88,12 +134,24 @@ jobs:
|
||||
- name: Set up Gradle
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
|
||||
- name: 统一版本号
|
||||
run: |
|
||||
# 1. 临时修改 version.properties 中的 VERSION_SUFFIX，供 build.gradle 读取 versionName
|
||||
echo "VERSION_SUFFIX=-beta.${{ env.BUILD_NUMBER }}" >> $GITHUB_WORKSPACE/version.properties
|
||||
|
||||
# 2. 覆盖 build.gradle 中复杂的 versionCode 计算逻辑
|
||||
# 将 versionCode 设为 10000 + BUILD_NUMBER，忽略 gitCommits
|
||||
# 替换 app/build.gradle 中 versionCode 所在行
|
||||
sed -i "s/versionCode 10000 + gitCommits/versionCode 10000 + ${{ env.BUILD_NUMBER }}/" $GITHUB_WORKSPACE/app/build.gradle
|
||||
|
||||
echo "versionName 已设置为 ${{ env.VERSIONL }}"
|
||||
echo "versionCode 已设置为 10000 + ${{ env.BUILD_NUMBER }}"
|
||||
|
||||
- name: Build With Gradle
|
||||
run: |
|
||||
echo "统一版本号"
|
||||
sed -i "s/ext.versionName = .*/ext.versionName = \"${{ env.VERSION }}\"/" $GITHUB_WORKSPACE/app/build.gradle
|
||||
echo "开始${{ env.product }}${{ env.type }}构建"
|
||||
chmod +x gradlew
|
||||
# Gradle 现在会读取修改后的 version.properties 来获取 versionName
|
||||
./gradlew assemble${{ env.product }}Release
|
||||
|
||||
- name: Move Missing Rules Files
|
||||
@@ -145,31 +203,6 @@ jobs:
|
||||
if-no-files-found: ignore
|
||||
path: ${{ github.workspace }}/mapping/mapping.txt
|
||||
|
||||
lanzou:
|
||||
needs: [ prepare, build ]
|
||||
if: ${{ github.event_name != 'pull_request' && needs.prepare.outputs.lanzou == 'yes' }}
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
# 登录蓝奏云后在控制台运行document.cookie
|
||||
ylogin: ${{ secrets.LANZOU_ID }}
|
||||
phpdisk_info: ${{ secrets.LANZOU_PSD }}
|
||||
# 蓝奏云里的文件夹ID（阅读3测试版:2670621）
|
||||
LANZOU_FOLDER_ID: ${{ secrets.LANZOU_FOLDER_ID }}
|
||||
#蓝奏云分享链接
|
||||
LANZOU_URL: ${{ secrets.LANZOU_URL }}
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/download-artifact@v5
|
||||
with:
|
||||
path: apk/
|
||||
- working-directory: apk/
|
||||
run: mv */*.apk . ;rm -rf */
|
||||
- name: Upload To Lanzou
|
||||
continue-on-error: true
|
||||
run: |
|
||||
path="$GITHUB_WORKSPACE/apk/"
|
||||
python3 $GITHUB_WORKSPACE/.github/scripts/lzy_web.py "$path" "$LANZOU_FOLDER_ID"
|
||||
echo "[$(date -u -d '+8 hour' '+%Y.%m.%d %H:%M:%S')] 分享链接: $LANZOU_URL"
|
||||
|
||||
test_Branch:
|
||||
needs: [ prepare, build ]
|
||||
@@ -194,26 +227,87 @@ jobs:
|
||||
git commit -m "${{ needs.prepare.outputs.versionL }}"
|
||||
git push -f -u origin test
|
||||
|
||||
telegram:
|
||||
create_pre_release:
|
||||
needs: [ prepare, build ]
|
||||
if: ${{ github.event_name != 'pull_request' && needs.prepare.outputs.telegram == 'yes' }}
|
||||
if: |
|
||||
github.event_name == 'push' &&
|
||||
github.ref == 'refs/heads/main' &&
|
||||
needs.prepare.outputs.build_number > 0 &&
|
||||
success()
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/download-artifact@v5
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
path: apk/
|
||||
- working-directory: apk/
|
||||
fetch-depth: 0
|
||||
|
||||
- name: 获取所有 Commit 消息作为 Release Body
|
||||
id: get_commits
|
||||
run: |
|
||||
for file in `ls */*.apk`; do
|
||||
mv "$file" "$(echo "$file"|sed -e 's#.*\/##g' -e "s/_/ /g" -e 's/legado/阅读/')"
|
||||
done
|
||||
rm -rf */
|
||||
- name: Post to channel
|
||||
uses: xireiki/channel-post@v1
|
||||
# 获取从上一个 tag 到当前 commit 之间的所有 commit 消息
|
||||
# 如果 latest_tag 为空，则从第一个 commit 开始获取
|
||||
|
||||
LATEST_TAG="${{ needs.prepare.outputs.latest_tag }}"
|
||||
|
||||
if [ -z "$LATEST_TAG" ]; then
|
||||
# 如果没有找到任何 tag，则从第一个 commit 开始
|
||||
COMMIT_LOG=$(git log --pretty=format:'* %s (%an)' --reverse)
|
||||
else
|
||||
# 从最近的 tag 到当前 HEAD
|
||||
# 使用 ^$LATEST_TAG 来排除 LATEST_TAG 本身的 commit
|
||||
COMMIT_LOG=$(git log $LATEST_TAG..HEAD --pretty=format:'* %s (%an)')
|
||||
fi
|
||||
|
||||
# 检查是否获取到日志
|
||||
if [ -z "$COMMIT_LOG" ]; then
|
||||
RELEASE_BODY="本次发布无新增 Commit。"
|
||||
else
|
||||
RELEASE_BODY="# 本次更新内容\n\n$COMMIT_LOG"
|
||||
fi
|
||||
|
||||
# 输出给下一步使用
|
||||
echo "release_body<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "$RELEASE_BODY" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
- name:
|
||||
创建 Pre-Release Tag: v${{ needs.prepare.outputs.versionL }}
|
||||
# 创建一个 Tag，供下一轮计算版本号时使用
|
||||
run: |
|
||||
git tag v${{ needs.prepare.outputs.versionL }}
|
||||
git push origin v${{ needs.prepare.outputs.versionL }}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: 创建 Pre-Release
|
||||
id: create_release
|
||||
uses: actions/create-release@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
chat_id: ${{ secrets.CHANNEL_ID }}
|
||||
bot_token: ${{ secrets.BOT_TOKEN }}
|
||||
context: "#阅读 #Legado #Beta ${{ needs.prepare.outputs.versionL }}"
|
||||
path: apk/*
|
||||
method: sendFile
|
||||
# Tag 名称：3.26.3-beta.1
|
||||
tag_name: ${{ needs.prepare.outputs.versionL }}
|
||||
# Release 标题：3.26.3-beta.1
|
||||
release_name: ${{ needs.prepare.outputs.versionL }}
|
||||
# Release 内容为所有 Commit 消息
|
||||
body: ${{ steps.get_commits.outputs.release_body }}
|
||||
draft: false
|
||||
# 标记为预发布版本
|
||||
prerelease: true
|
||||
|
||||
- name: 下载所有 APK Artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: '*-apk'
|
||||
path: artifacts
|
||||
merge-multiple: true
|
||||
|
||||
- name: 上传 Release Assets
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: artifacts/*.apk
|
||||
# 重新命名上传的 APK 文件，使其包含版本号
|
||||
asset_name: legado-${{ needs.prepare.outputs.versionL }}.apk
|
||||
asset_content_type: application/zip
|
||||
Reference in New Issue
Block a user