Merge remote-tracking branch 'origin/master'

3 years ago · e3de23cc4c
parent 50b4d40656 e27a5b7531
commit e3de23cc4c
13 changed files with 58 additions and 22 deletions
--- a/.github/scripts/cronet.sh
+++ b/.github/scripts/cronet.sh
@ -49,3 +49,5 @@ else
    chmod +x gradlew
    ./gradlew app:downloadCronet
 fi
+
+rm -f cronet lastest_cronet_version stable_page
--- a/.github/workflows/cronet.yml
+++ b/.github/workflows/cronet.yml
@ -0,0 +1,40 @@
+name: Update Cronet
+
+on:
+  schedule:
+    - cron: 0 0 * * *
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+
+      - name: Download Lastest Cronet jar
+        run: |
+          echo "获取cronet最新版本"
+          source .github/scripts/cronet.sh
+          echo "PR_TITLE=Bump cronet from $current_cronet_version to $lastest_cronet_version " >>$GITHUB_ENV
+          echo "PR_BODY=Changes in the [Git log](https://chromium.googlesource.com/chromium/src/+log/$current_cronet_version..$lastest_cronet_version)" >>$GITHUB_ENV
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        continue-on-error: true
+        with:
+          token: ${{ secrets.ACTIONS_TOKEN }}
+          title: ${{ env.PR_TITLE }}
+          commit-message: |
+            ${{ env.PR_TITLE }}
+            - ${{ env.PR_BODY }}
+          body: ${{ env.PR_BODY }}
+          branch: cronet
+          delete-branch: true
+          add-paths: |
+            *cronet*jar
+            *cronet.json
+            *updateLog.md
+            gradle.properties
+          
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,4 +1,4 @@
-name: Build and Release
+name: Release Build

 on:
 #  push:
@ -37,17 +37,6 @@ jobs:
          git config --global user.name "github-actions[bot]"
          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"

-      - name: Download Lastest Cronet jar
-        run: |
-          echo "获取cronet最新版本"
-          source .github/scripts/cronet.sh
-          git add *cronet*jar
-          git add *cronet.json
-          git add gradle.properties
-          git add *updateLog.md
-          git commit -m "bump cronet version: $lastest_cronet_version" -m "changes in the [Git log](https://chromium.googlesource.com/chromium/src/+log/$current_cronet_version..$lastest_cronet_version)"
-          git push origin master
-
      - name: Release Apk Sign
        run: |
          echo "给apk增加签名"
--- a/app/src/main/assets/web/bookshelf/css/detail.fd79dfd5.css
+++ b/app/src/main/assets/web/bookshelf/css/detail.fd79dfd5.css
--- a/app/src/main/assets/web/bookshelf/img/error.6c7f6bd0.png
+++ b/app/src/main/assets/web/bookshelf/img/error.6c7f6bd0.png
--- a/app/src/main/assets/web/bookshelf/img/loading.550df755.gif
+++ b/app/src/main/assets/web/bookshelf/img/loading.550df755.gif
--- a/app/src/main/assets/web/bookshelf/index.html
+++ b/app/src/main/assets/web/bookshelf/index.html
@ -1,3 +1,3 @@
-<!DOCTYPE html><html lang="en" style="padding: 0;height:100%"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="../favicon.ico" type="image/x-icon"><link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"><title>Legado Bookshelf</title><link href="css/about.af6c5045.css" rel="prefetch"><link href="css/detail.508547d2.css" rel="prefetch"><link href="js/about.3de69a08.js" rel="prefetch"><link href="js/detail.fdc516bb.js" rel="prefetch"><link href="css/app.e4c919b7.css" rel="preload" as="style"><link href="css/chunk-vendors.5f0f4fba.css" rel="preload" as="style"><link href="js/app.cf266357.js" rel="preload" as="script"><link href="js/chunk-vendors.d2b07f8f.js" rel="preload" as="script"><link href="css/chunk-vendors.5f0f4fba.css" rel="stylesheet"><link href="css/app.e4c919b7.css" rel="stylesheet"></head><style>body::-webkit-scrollbar {
+<!DOCTYPE html><html lang="en" style="padding: 0;height:100%"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="../favicon.ico" type="image/x-icon"><link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"><title>Legado Bookshelf</title><link href="css/about.af6c5045.css" rel="prefetch"><link href="css/detail.fd79dfd5.css" rel="prefetch"><link href="js/about.152de90a.js" rel="prefetch"><link href="js/detail.4bfda094.js" rel="prefetch"><link href="css/app.e4c919b7.css" rel="preload" as="style"><link href="css/chunk-vendors.5f0f4fba.css" rel="preload" as="style"><link href="js/app.8d586793.js" rel="preload" as="script"><link href="js/chunk-vendors.be6090cd.js" rel="preload" as="script"><link href="css/chunk-vendors.5f0f4fba.css" rel="stylesheet"><link href="css/app.e4c919b7.css" rel="stylesheet"></head><style>body::-webkit-scrollbar {
        display: none;
-    }</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.d2b07f8f.js"></script><script src="js/app.cf266357.js"></script></body></html>
+    }</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.be6090cd.js"></script><script src="js/app.8d586793.js"></script></body></html>
--- a/app/src/main/assets/web/bookshelf/js/about.152de90a.js
+++ b/app/src/main/assets/web/bookshelf/js/about.152de90a.js
--- a/app/src/main/assets/web/bookshelf/js/app.8d586793.js
+++ b/app/src/main/assets/web/bookshelf/js/app.8d586793.js
--- a/app/src/main/assets/web/bookshelf/js/app.cf266357.js
+++ b/app/src/main/assets/web/bookshelf/js/app.cf266357.js
--- a/app/src/main/assets/web/bookshelf/js/chunk-vendors.be6090cd.js
+++ b/app/src/main/assets/web/bookshelf/js/chunk-vendors.be6090cd.js
--- a/app/src/main/assets/web/bookshelf/js/detail.4bfda094.js
+++ b/app/src/main/assets/web/bookshelf/js/detail.4bfda094.js
--- a/app/src/main/assets/web/bookshelf/js/detail.fdc516bb.js
+++ b/app/src/main/assets/web/bookshelf/js/detail.fdc516bb.js