From db35a7e96679fed30929ef95cde3dd9e4b4e3dc5 Mon Sep 17 00:00:00 2001 From: HalfLife Date: Mon, 9 Aug 2021 19:31:33 +0800 Subject: [PATCH 1/6] auto build and release --- .github/workflows/release.yml | 90 ++++++++++++++++++++++ .github/workflows/{legado.yml => test.yml} | 4 +- CHANGELOG.md | 9 ++- 3 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/release.yml rename .github/workflows/{legado.yml => test.yml} (98%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..f1fc46210 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,90 @@ +name: Build and Release + +on: + release: + types: [published] + push: + branches: + - master + paths: + - 'CHANGELOG.md' +# schedule: +# - cron: '0 4 * * *' + +jobs: + build: + runs-on: ubuntu-latest + env: + # 登录蓝奏云后在控制台运行document.cookie + ylogin: ${{ secrets.LANZOU_ID }} + phpdisk_info: ${{ secrets.LANZOU_PSD }} + # 蓝奏云里的文件夹ID(阅读3测试版:2670621) + LANZOU_FOLDER_ID: '2670621' + # 是否上传到artifact + UPLOAD_ARTIFACT: 'true' + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-legado-${{ hashFiles('**/updateLog.md') }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-legado-${{ hashFiles('**/updateLog.md') }}- + - name: Release Apk Sign + run: | + echo "给apk增加签名" + cp $GITHUB_WORKSPACE/.github/workflows/legado.jks $GITHUB_WORKSPACE/app/legado.jks + sed '$a\RELEASE_STORE_FILE=./legado.jks' $GITHUB_WORKSPACE/gradle.properties -i + sed '$a\RELEASE_KEY_ALIAS=legado' $GITHUB_WORKSPACE/gradle.properties -i + sed '$a\RELEASE_STORE_PASSWORD=gedoor_legado' $GITHUB_WORKSPACE/gradle.properties -i + sed '$a\RELEASE_KEY_PASSWORD=gedoor_legado' $GITHUB_WORKSPACE/gradle.properties -i + - name: Unify Version Name + run: | + echo "统一版本号" + VERSION=$(date -d "8 hour" -u +3.%y.%m%d%H) + echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV + sed "/def version/c def version = \"$VERSION\"" $GITHUB_WORKSPACE/app/build.gradle -i + - name: Build With Gradle + run: | + echo "开始进行release构建" + chmod +x gradlew + ./gradlew assembleAppRelease --build-cache --parallel + echo "开始进行cronet构建" + ./gradlew assembleCronetRelease --build-cache --parallel + - name: Organize the Files + run: | + mkdir -p ${{ github.workspace }}/apk/ + cp -rf ${{ github.workspace }}/app/build/outputs/apk/*/*/*.apk ${{ github.workspace }}/apk/ + - name: Upload App To Artifact + if: ${{ env.UPLOAD_ARTIFACT != 'false' }} + uses: actions/upload-artifact@v2 + with: + name: legado apk + path: ${{ github.workspace }}/apk/*.apk + - name: Upload App To Lanzou + if: ${{ env.ylogin }} + run: | + path="$GITHUB_WORKSPACE/apk" + files=$(ls $path) + for f in $files + do + if [[ $f == *"apk" ]]; then + file=$f + echo "[$(date -u -d '+8 hour' '+%Y.%m.%d %H:%M:%S')] 文件:$file" + python3 $GITHUB_WORKSPACE/.github/scripts/lzy_web.py "$path/$file" "$LANZOU_FOLDER_ID" + fi + done + echo "[$(date -u -d '+8 hour' '+%Y.%m.%d %H:%M:%S')] 分享链接: https://kunfei.lanzoux.com/b0f810h4b" + - name: Release + uses: softprops/action-gh-release@59c3b4891632ff9a897f99a91d7bc557467a3a22 + with: + name: legado_app_${{ env.RELEASE_VERSION }} + tag_name: ${{ env.RELEASE_VERSION }} + body_path: ${{ github.workspace }}/CHANGELOG.md + draft: false + prerelease: false + files: ${{ github.workspace }}/apk/*.apk + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/legado.yml b/.github/workflows/test.yml similarity index 98% rename from .github/workflows/legado.yml rename to .github/workflows/test.yml index 99dd5b2c5..646a90293 100644 --- a/.github/workflows/legado.yml +++ b/.github/workflows/test.yml @@ -1,8 +1,6 @@ -name: Android CI +name: Test Build on: - release: - types: [published] push: branches: - master diff --git a/CHANGELOG.md b/CHANGELOG.md index ace01cdff..819cfde7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# 1.0.0 (2020-02-09) - - +**2021/08/08** +1. 背景图片添加模糊设置 +2. 书籍信息界面添加置顶操作 +3. 自动翻页时屏幕常亮 +4. 字典:中文使用百度汉语字典,英文使用海词字典。 by ag2s20150909 +5. 导入规则时可以选择添加分组还是替换分组 From f6cc3041ca1255cf6ecce0a3aa98139676595d7f Mon Sep 17 00:00:00 2001 From: HalfLife <6436073+o0HalfLife0o@users.noreply.github.com> Date: Mon, 9 Aug 2021 20:31:31 +0800 Subject: [PATCH 2/6] Update release.yml --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1fc46210..e6df76098 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,6 @@ name: Build and Release on: - release: - types: [published] push: branches: - master From 8a8d50c15ca811ec5ee18aa43d43a08ba5ad6be2 Mon Sep 17 00:00:00 2001 From: HalfLife <6436073+o0HalfLife0o@users.noreply.github.com> Date: Mon, 9 Aug 2021 22:50:32 +0800 Subject: [PATCH 3/6] Update release.yml --- .github/workflows/release.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e6df76098..429321285 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,3 +86,22 @@ jobs: files: ${{ github.workspace }}/apk/*.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Push Assets To "release" Branch + run: | + cd $GITHUB_WORKSPACE/apk || exit 1 + git init + git config --local user.name "github-actions[bot]" + git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git checkout -b release + git add *.apk + git commit -m "${{ env.RELEASE_NAME }}" + git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}" + git push -f -u origin release + - name: Purge Jsdelivr Cache + run: | + result=$(curl -s https://purge.jsdelivr.net/gh/${{ github.repository }}@release/) + if echo $result |grep -q 'success.*true'; then + echo "jsdelivr缓存更新成功" + else + echo $result + fi From 4b49cf2766290b76deeb8f4a09cec7f0558f9812 Mon Sep 17 00:00:00 2001 From: HalfLife <6436073+o0HalfLife0o@users.noreply.github.com> Date: Mon, 9 Aug 2021 22:54:13 +0800 Subject: [PATCH 4/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9bbf92e51..2d8caac00 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ * [google play](https://play.google.com/store/apps/details?id=io.legado.play.release) * [酷安](https://www.coolapk.com/apk/io.legado.app.release) * [release](https://github.com/gedoor/legado/releases/latest) +* [jsdelivr](https://cdn.jsdelivr.net/gh/gedoor/legado@release/) * [网盘](https://kunfei.lanzoui.com/b0f7pt4ja) * [测试版](https://kunfei.lanzoui.com/b0f810h4b) From 32b5841164e4ff5086f0ab2c973164c378e824ce Mon Sep 17 00:00:00 2001 From: HalfLife <6436073+o0HalfLife0o@users.noreply.github.com> Date: Mon, 9 Aug 2021 22:57:47 +0800 Subject: [PATCH 5/6] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 429321285..80ac584e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,7 +94,7 @@ jobs: git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git checkout -b release git add *.apk - git commit -m "${{ env.RELEASE_NAME }}" + git commit -m "${{ env.RELEASE_VERSION }}" git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}" git push -f -u origin release - name: Purge Jsdelivr Cache From 4b3d3e483d9ea741215a42af8b975d08b4566a5f Mon Sep 17 00:00:00 2001 From: HalfLife <6436073+o0HalfLife0o@users.noreply.github.com> Date: Mon, 9 Aug 2021 23:01:18 +0800 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 819cfde7d..6cae673ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,4 @@ -**2021/08/08** +**2021/08/09** -1. 背景图片添加模糊设置 -2. 书籍信息界面添加置顶操作 -3. 自动翻页时屏幕常亮 -4. 字典:中文使用百度汉语字典,英文使用海词字典。 by ag2s20150909 -5. 导入规则时可以选择添加分组还是替换分组 +1. 修复选择文字不能选择单个文字的bug +2.