diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 762359e..62573df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Auto build and delay +name: build on: push: @@ -60,15 +60,15 @@ jobs: path="$GITHUB_WORKSPACE/app/build/outputs/apk/debug" fi echo ::set-output name=file_path::"$path" - - name: Upload App To Artifact - uses: actions/upload-artifact@v3 - with: - name: FYReader-apk - path: ${{ steps.get_path.outputs.file_path }} - - name: Upload App To Lanzou + - name: Upload Lanzou run: | echo "上传APP至蓝奏云" - python3 $GITHUB_WORKSPACE/keystore/scripts/lzy.py "${{ steps.get_path.outputs.file_path }}" "${{ steps.config.outputs.lanzou_folder_id }}" "${{ steps.config.outputs.version_name }}" + tag_name=${{ steps.config.outputs.version_name }} + if [[ ${{ steps.config.outputs.need_create_release }} != 'true' ]];then + gitHead=$(git rev-parse --short HEAD) + tag_name=${{ steps.config.outputs.version_name }}-$gitHead + fi + python3 $GITHUB_WORKSPACE/keystore/scripts/lzy.py "${{ steps.get_path.outputs.file_path }}" "${{ steps.config.outputs.lanzou_folder_id }}" "$tag_name" echo "[$(date -u -d '+8 hour' '+%Y.%m.%d %H:%M:%S')] 分享链接: ${{ steps.config.outputs.lanzou_share_url }}" - name: Release if: ${{ steps.config.outputs.need_create_release == 'true' && github.ref == 'refs/heads/master' }} @@ -80,10 +80,40 @@ jobs: tag_name: ${{ steps.config.outputs.version_name }} name: FYReader_${{ steps.config.outputs.version_name }} files: | - app/build/outputs/apk/release/风月读书${{ steps.config.outputs.version_name }}-arm64-v8a.apk - app/build/outputs/apk/release/风月读书${{ steps.config.outputs.version_name }}-armeabi-v7a.apk - app/build/outputs/apk/release/风月读书${{ steps.config.outputs.version_name }}-x86_64.apk - app/build/outputs/apk/release/风月读书${{ steps.config.outputs.version_name }}-x86.apk - app/build/outputs/apk/release/风月读书${{ steps.config.outputs.version_name }}-universal.apk + ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-arm64-v8a.apk + ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-armeabi-v7a.apk + ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-x86_64.apk + ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-x86.apk + ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-universal.apk env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload Artifact arm64-v8a + uses: actions/upload-artifact@v3 + with: + name: app-arm64-v8a + path: ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-arm64-v8a.apk + + - name: Upload Artifact armeabi-v7a + uses: actions/upload-artifact@v3 + with: + name: app-armeabi-v7a + path: ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-armeabi-v7a.apk + + - name: Upload Artifact universal + uses: actions/upload-artifact@v3 + with: + name: app-universal + path: ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-universal.apk + + - name: Upload Artifact x86_64 + uses: actions/upload-artifact@v3 + with: + name: app-x86_64 + path: ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-x86_64.apk + + - name: Upload Artifact x86 + uses: actions/upload-artifact@v3 + with: + name: app-x86 + path: ${{ steps.get_path.outputs.file_path }}/风月读书${{ steps.config.outputs.version_name }}-x86.apk \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ae81850..502b5c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,16 +32,9 @@ def getVersionC() { if (versionCodeFile.canRead()) { Properties properties = new Properties() properties.load(new FileInputStream(versionCodeFile)) - def versionCode = properties['VERSION_CODE'].toInteger()//读取version_code.properties文件存放的版本号。 - def runTasks = gradle.startParameter.taskNames - def task = ':app:assembleRelease' - if (task in runTasks) { - properties['VERSION_CODE'] = (++versionCode).toString() - properties.store(versionCodeFile.newWriter(), null) - } - return versionCode + return properties['VERSION_CODE'].toInteger() } else { - throw new FileNotFoundException("无法读取version_code.properties文件!") + return 200 } } @@ -112,16 +105,12 @@ android { versionNameSuffix "-" + commitId } android.applicationVariants.all { variant -> - def buildType = variant.buildType.name variant.outputs.each { output -> def abi = output.getFilter(OutputFile.ABI) if (abi == null) { abi = "universal" } def fileName = "${name}v${defaultConfig.versionName}-${abi}.apk" - if (buildType == "debug"){ - fileName = "${name}v${defaultConfig.versionName}-${abi}-${commitId}.apk" - } output.outputFileName = fileName } }