[pull] master from 10bits:master

.github/legado/legado.sign

@@ -2,7 +2,3 @@ RELEASE_STORE_FILE=./legado.jks
 RELEASE_KEY_ALIAS=legado
 RELEASE_STORE_PASSWORD=gedoor_legado
 RELEASE_KEY_PASSWORD=gedoor_legado
-#org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-org.gradle.parallel=true
-org.gradle.configureondemand=true

.github/legado/rss_yck.json

@@ -0,0 +1,10 @@
+{
+    "customOrder": 5,
+    "enableJs": true,
+    "enabled": true,
+    "singleUrl": true,
+    "sourceGroup": "legado",
+    "sourceIcon": "https://www.yckceo.com/favicon.ico",
+    "sourceName": "源仓库",
+    "sourceUrl": "https://www.yckceo.com"
+}

.github/workflows/legado.yml

@@ -1,17 +1,16 @@
 name: Android CI
 
 on: 
-  watch:
-    types: [started]
   schedule:
-    - cron: '0 */6 * * *'
+    - cron: '0 */12 * * *'
+  workflow_dispatch:
 
 jobs:
   check_release:
     if: github.repository_owner == github.actor
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2  
     - name: check latest tag
       shell: bash
       env:
@@ -28,9 +27,20 @@ jobs:
           git clone $APP_GIT_URL $APP_WORKSPACE
           cd $APP_WORKSPACE
           git checkout $LATEST_TAG 
-          echo ::set-output name=if_release::true
+          echo "if_release=true" >>$GITHUB_OUTPUT
         fi
-
+
+    - name: setup JDK 17
+      if: steps.check_release.outputs.if_release == 'true'
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 17
+
+    - name: setup Gradle
+      if: steps.check_release.outputs.if_release == 'true'
+      uses: gradle/gradle-build-action@v2.4.2
+
     - name: build apk
       id: build_apk
       if: steps.check_release.outputs.if_release == 'true'
@@ -47,7 +57,7 @@ jobs:
       run: |
         function set_env() { echo "$1=$2" >> $GITHUB_ENV; }
         if [ -f $APP_BUILD_APK ]; then
-            echo ::set-output name=if_publish::true
+            echo "if_publish=true" >>$GITHUB_OUTPUT
             set_env APP_RELEASE_NAME $APP_UPLOAD_NAME.apk
             set_env APP_RELEASE      $APP_BUILD_APK
         fi
@@ -86,86 +96,3 @@ jobs:
         source $GITHUB_WORKSPACE/action_util.sh
         update_info
 
-  build_apk:
-    if: github.event_name != 'schedule' && github.repository_owner == github.actor
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: set env
-      shell: bash
-      env:
-        SECRETS_APP_NAME: ${{ secrets.APP_NAME }}
-        SECRETS_GIT_URL: ${{ secrets.GIT_URL }}
-        SECRETS_SUFFIX: ${{ secrets.SUFFIX }}
-        SECRETS_ENABLE: ${{ secrets.ENABLE }}
-        SECRETS_MINIFY: ${{ secrets.MINIFY }}
-        SECRETS_RENAME: ${{ secrets.RENAME }}
-        REPO_OWNER: ${{ github.repository_owner }}
-        REPO_ACTOR: ${{ github.actor }}
-        SECRETS_TAG: ${{ secrets.TAG }}
-        SECRETS_LAUNCH_NAME: ${{ secrets.LAUNCH_NAME }}
-      run: source $GITHUB_WORKSPACE/action_setenv.sh
-
-    - name: clone code
-      shell: bash
-      run: source $GITHUB_WORKSPACE/action_clone.sh
-
-    - name: custom your app
-      shell: bash
-      run: |
-        source $GITHUB_WORKSPACE/action_app_custom.sh
-
-    - name: hash files
-      if: success()
-      id: hash_files
-      shell: bash
-      run: |
-        find $APP_WORKSPACE -type f -regex '.*/\(.*\.gradle\|gradle-wrapper\.properties\)' -exec \
-        cat '{}' \; >$APP_WORKSPACE/bindfile
-        echo ::set-output name=hash::$(sha1sum $APP_WORKSPACE/bindfile | awk '{print $1}')
-
-    - uses: actions/cache@v2
-      if: env.APP_NAME == 'legado' && steps.hash_files.outputs.hash != null
-      with:
-        path: |
-          ~/.gradle/caches
-          !~/.gradle/caches/build-cache-1
-          ~/.gradle/wrapper
-        key: legado-gradle-${{ hashFiles('**/.lastcheck') }}-${{ steps.hash_files.outputs.hash }}
-        restore-keys: |
-          legado-gradle-${{ hashFiles('**/.lastcheck') }}-
-
-    - uses: actions/cache@v2
-      if: env.APP_NAME == 'legado'
-      with:
-        path: |
-          ~/.gradle/caches/build-cache-1
-        key: legado-cache-${{ hashFiles('**/.lastcheck') }}-${{ github.run_id }}
-        restore-keys: |
-          legado-cache-${{ hashFiles('**/.lastcheck') }}-          
-
-    - name: build  your app
-      if: success()
-      shell: bash
-      run: |
-        source $GITHUB_WORKSPACE/action_app_build.sh
-        app_build
-
-    - name: upload artifact
-      uses: actions/upload-artifact@v2
-      if: success()
-      with:
-        name: ${{ env.APP_UPLOAD_NAME }}
-        path: ${{ env.APP_UPLOAD }}
-
-    - name: upload to webdav
-      if: success()
-      shell: bash
-      env:
-        WEBDAV_URL: ${{ secrets.WEBDAV_URL }}
-        WEBDAV_AUTH: ${{ secrets.WEBDAV_AUTH }}
-        WEBDAV_UPLOAD: ${{ secrets.WEBDAV_UPLOAD }}
-      run: |
-        source $GITHUB_WORKSPACE/action_util.sh
-        webdav_upload $APP_UPLOAD/*.apk
-

.github/workflows/legado_custom.yml

@@ -0,0 +1,114 @@
+name: LegadoCustom
+
+on: 
+  workflow_dispatch:
+    inputs: 
+      git_url: 
+        description: 'Your legado git url'      
+        required: true 
+        default: 'https://github.com/gedoor/legado.git'
+      git_tag:
+        description: 'Your legado git tag'      
+        required: true 
+        default: '3.23.110211'
+      app_channel:
+        description: 'Your legado build channel(App)'      
+        required: true 
+        default: 'App'
+      app_custom:
+        description: 'Your legado custom script'      
+        required: true 
+        default: 'diy_test.sh'
+      app_name: 
+        description: 'Legado app name'      
+        required: true 
+        default: '阅读'
+      app_suffix: 
+        description: 'Legado app suffix'      
+        required: true 
+        default: 'A'
+      app_launch_name: 
+        description: 'Legado app launch name'      
+        required: true 
+        default: '阅读.A'
+      webdav_upload: 
+        description: 'Webdav upload when build apk finish'      
+        required: true
+        default: 'false'
+      webdav_url: 
+        description: 'Webdav upload url'      
+        required: true
+        default: 'https://dav.jianguoyun.com/dav/'
+      webdav_auth:
+        description: 'Webdav auth user and password'      
+        required: true 
+        default: 'test@test.com:test_12345'
+
+jobs:
+  build_apk:
+    if: github.repository_owner == github.actor
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: setup JDK 17
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 17
+
+    - name: setup Gradle
+      uses: gradle/gradle-build-action@v2.4.2
+
+    - name: set env
+      shell: bash
+      env:
+        SECRETS_APP_NAME: ${{ github.event.inputs.app_name }}
+        SECRETS_GIT_URL: ${{ github.event.inputs.git_url }}
+        SECRETS_CHANNEL: ${{ github.event.inputs.app_channel }}
+        SECRETS_SUFFIX: ${{ github.event.inputs.app_suffix }}
+        SECRETS_ENABLE: ${{ secrets.ENABLE }}
+        SECRETS_MINIFY: ${{ secrets.MINIFY }}
+        SECRETS_RENAME: ${{ secrets.RENAME }}
+        REPO_OWNER: ${{ github.repository_owner }}
+        REPO_ACTOR: ${{ github.actor }}
+        SECRETS_TAG: ${{ github.event.inputs.git_tag }}
+        SECRETS_LAUNCH_NAME: ${{ github.event.inputs.app_launch_name }}
+      run: source $GITHUB_WORKSPACE/action_setenv.sh
+
+    - name: clone code
+      shell: bash
+      run: source $GITHUB_WORKSPACE/action_clone.sh
+
+    - name: custom your app
+      shell: bash
+      env:
+        custom: ${{ github.event.inputs.app_custom }}
+      run: |
+        source $GITHUB_WORKSPACE/diy/$custom
+
+    - name: build  your app
+      if: success()
+      shell: bash
+      run: |
+        source $GITHUB_WORKSPACE/action_app_build.sh
+        app_build
+
+    - name: upload artifact
+      uses: actions/upload-artifact@v4
+      if: success()
+      with:
+        name: ${{ env.APP_UPLOAD_NAME }}
+        path: ${{ env.APP_UPLOAD }}
+
+    - name: upload to webdav
+      if: success()
+      shell: bash
+      env:
+        WEBDAV_URL: ${{ github.event.inputs.webdav_url }}
+        WEBDAV_AUTH: ${{ github.event.inputs.webdav_auth }}
+        WEBDAV_UPLOAD: ${{ github.event.inputs.webdav_upload }}
+      run: |
+        source $GITHUB_WORKSPACE/action_util.sh
+        webdav_upload $APP_UPLOAD/*.apk
+

.lastcheck

@@ -1,3 +1,116 @@
+3.23.110211
+3.23.110115
+3.23.103114
+3.23.051919
+3.23.051822
+3.23.051323
+3.23.050309
+3.23.040420
+3.23.040118
+3.23.032923
+3.23.032820
+3.23.032123
+3.23.032112
+3.23.032021
+3.23.031520
+3.23.031420
+3.23.031314
+3.23.031210
+3.23.030400
+3.23.022715
+3.23.022621
+3.23.022219
+3.23.021621
+3.23.020921
+3.23.013123
+3.23.012922
+3.23.012018
+3.23.011918
+3.23.011022
+3.23.010719
+3.22.122419
+3.22.121521
+3.22.121018
+3.22.120121
+3.22.112222
+3.22.111423
+3.22.110823
+3.22.102918
+3.22.102223
+3.22.102020
+3.22.101712
+3.22.101709
+3.22.101619
+3.22.101421
+3.22.100921
+3.22.100521
+3.22.100210
+3.22.100120
+3.22.092618
+3.22.092400
+3.22.092220
+3.22.092020
+3.22.091920
+3.22.091719
+3.22.091712
+3.22.091613
+3.22.091520
+3.22.083120
+3.22.082409
+3.22.081920
+3.22.080322
+3.22.072122
+3.22.071618
+3.22.071010
+3.22.070921
+3.22.070722
+3.22.062320
+3.22.061722
+3.22.061022
+3.22.060120
+3.22.052723
+3.22.052708
+3.22.052621
+3.22.052113
+3.22.051719
+3.22.051612
+3.22.051215
+3.22.051021
+3.22.050215
+3.22.050122
+3.22.042323
+3.22.042309
+3.22.042218
+3.22.041820
+3.22.041421
+3.22.041418
+3.22.041209
+3.22.040716
+3.22.040517
+3.22.033020
+3.22.032521
+3.22.032320
+3.22.031722
+3.22.031519
+3.22.031209
+3.22.030919
+3.22.030711
+3.22.030410
+3.22.030322
+3.22.022822
+3.22.022814
+3.22.022719
+3.22.022623
+3.22.022509
+3.22.022219
+3.22.021714
+3.22.021120
+3.22.021118
+3.22.021109
+3.22.020919
+3.22.020311
+3.22.012821
+3.22.012619
 3.22.012019
 3.22.011116
 3.22.011108