renil/lx-music-mobile-mod
1
0
Fork 0
mirror of https://github.com/ikun0014/lx-music-mobile.git synced 2025-07-04 19:48:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更新版本命名规则

Browse Source
This commit is contained in:
lyswhut 2021-05-16 12:48:12 +08:00
parent 5c30b56ac9
commit 55649dd2ae
4 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/beta-pack.yml vendored
View File

@ -36,12 +36,12 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: node_modules path: node_modules
key: ${{ runner.os }}-node-caches-${{ hashFiles('**/yarn-lock.json') }} key: ${{ runner.os }}-node-caches-${{ hashFiles('**/package-lock.json') }}
restore-keys: | restore-keys: |
${{ runner.os }}-node-caches- ${{ runner.os }}-node-caches-
- name: Install dependencies - name: Install dependencies
run: yarn install run: npm install
- name: Build Packages - name: Build Packages
run: | run: |
@ -49,32 +49,36 @@ jobs:
echo ${{ secrets.KEYSTORE_STORE_FILE_BASE64 }} | base64 --decode > app/${{ secrets.KEYSTORE_STORE_FILE }} echo ${{ secrets.KEYSTORE_STORE_FILE_BASE64 }} | base64 --decode > app/${{ secrets.KEYSTORE_STORE_FILE }}
./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='${{ secrets.KEYSTORE_STORE_FILE }}' -PMYAPP_UPLOAD_KEY_ALIAS='${{ secrets.KEYSTORE_KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}' -PMYAPP_UPLOAD_KEY_PASSWORD='${{ secrets.KEYSTORE_KEY_PASSWORD }}' ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='${{ secrets.KEYSTORE_STORE_FILE }}' -PMYAPP_UPLOAD_KEY_ALIAS='${{ secrets.KEYSTORE_KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}' -PMYAPP_UPLOAD_KEY_PASSWORD='${{ secrets.KEYSTORE_KEY_PASSWORD }}'
# Push tag to GitHub if package.json version's tag is not tagged
- name: Get package version
run: node -p -e '`PACKAGE_VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
- name: Upload Artifact arm64-v8a - name: Upload Artifact arm64-v8a
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-arm64-v8a-release name: app-arm64-v8a-release
path: android/app/build/outputs/apk/release/app-arm64-v8a-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-arm64-v8a.apk
- name: Upload Artifact armeabi-v7a - name: Upload Artifact armeabi-v7a
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-armeabi-v7a-release name: app-armeabi-v7a-release
path: android/app/build/outputs/apk/release/app-armeabi-v7a-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-armeabi-v7a.apk
- name: Upload Artifact universal - name: Upload Artifact universal
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-universal-release name: app-universal-release
path: android/app/build/outputs/apk/release/app-universal-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-universal.apk
- name: Upload Artifact x86_64 - name: Upload Artifact x86_64
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-x86_64-release name: app-x86_64-release
path: android/app/build/outputs/apk/release/app-x86_64-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-x86_64.apk
- name: Upload Artifact x86 - name: Upload Artifact x86
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-x86-release name: app-x86-release
path: android/app/build/outputs/apk/release/app-x86-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-x86.apk

24
.github/workflows/release.yml vendored
View File

@ -36,12 +36,12 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: node_modules path: node_modules
key: ${{ runner.os }}-node-caches-${{ hashFiles('**/yarn-lock.json') }} key: ${{ runner.os }}-node-caches-${{ hashFiles('**/package-lock.json') }}
restore-keys: | restore-keys: |
${{ runner.os }}-node-caches- ${{ runner.os }}-node-caches-
- name: Install dependencies - name: Install dependencies
run: yarn install run: npm install
- name: Build Packages - name: Build Packages
run: | run: |
@ -70,11 +70,11 @@ jobs:
draft: false draft: false
tag_name: v${{ env.PACKAGE_VERSION }} tag_name: v${{ env.PACKAGE_VERSION }}
files: | files: |
android/app/build/outputs/apk/release/app-arm64-v8a-release.apk android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-arm64-v8a.apk
android/app/build/outputs/apk/release/app-armeabi-v7a-release.apk android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-armeabi-v7a.apk
android/app/build/outputs/apk/release/app-x86_64-release.apk android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-x86_64.apk
android/app/build/outputs/apk/release/app-x86-release.apk android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-x86.apk
android/app/build/outputs/apk/release/app-universal-release.apk android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-universal.apk
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -82,28 +82,28 @@ jobs:
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-arm64-v8a-release name: app-arm64-v8a-release
path: android/app/build/outputs/apk/release/app-arm64-v8a-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-arm64-v8a.apk
- name: Upload Artifact armeabi-v7a - name: Upload Artifact armeabi-v7a
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-armeabi-v7a-release name: app-armeabi-v7a-release
path: android/app/build/outputs/apk/release/app-armeabi-v7a-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-armeabi-v7a.apk
- name: Upload Artifact universal - name: Upload Artifact universal
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-universal-release name: app-universal-release
path: android/app/build/outputs/apk/release/app-universal-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-universal.apk
- name: Upload Artifact x86_64 - name: Upload Artifact x86_64
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-x86_64-release name: app-x86_64-release
path: android/app/build/outputs/apk/release/app-x86_64-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-x86_64.apk
- name: Upload Artifact x86 - name: Upload Artifact x86
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: app-x86-release name: app-x86-release
path: android/app/build/outputs/apk/release/app-x86-release.apk path: android/app/build/outputs/apk/release/lx-music-mobile-v${{ env.PACKAGE_VERSION }}-x86.apk

9
android/app/build.gradle
View File

@ -131,7 +131,7 @@ def getNpmPackageJson() {
def npmPackageJson = getNpmPackageJson() def npmPackageJson = getNpmPackageJson()
def verCode = npmPackageJson["versionCode"] def verCode = npmPackageJson["versionCode"]
def verName = npmPackageJson["version"] def verName = npmPackageJson["version"]
def applicationName = npmPackageJson["name"]
android { android {
ndkVersion rootProject.ext.ndkVersion ndkVersion rootProject.ext.ndkVersion
@ -211,9 +211,14 @@ android {
// Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc. // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4] def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI) def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants if (abi == null) { // null for the universal-debug, universal-release variants
output.outputFileName =
"${applicationName}-v${defaultConfig.versionName}-universal.apk"
} else {
output.versionCodeOverride = output.versionCodeOverride =
defaultConfig.versionCode * 1000 + versionCodes.get(abi) defaultConfig.versionCode * 1000 + versionCodes.get(abi)
output.outputFileName =
"${applicationName}-v${defaultConfig.versionName}-${abi}.apk"
} }
} }

2
src/utils/version.js
View File

@ -72,7 +72,7 @@ let apkSavePath
export const downloadNewVersion = async(version, onDownload = noop) => { export const downloadNewVersion = async(version, onDownload = noop) => {
const abi = await getTargetAbi() const abi = await getTargetAbi()
const url = `https://github.com/${author.name}/${name}/releases/download/v${version}/app-${abi}-release.apk` const url = `https://github.com/${author.name}/${name}/releases/download/v${version}/${name}-v${version}-${abi}.apk`
let savePath = temporaryDirectoryPath + '/lx-music-mobile.apk' let savePath = temporaryDirectoryPath + '/lx-music-mobile.apk'
if (downloadJobId) await stopDownload(downloadJobId) if (downloadJobId) await stopDownload(downloadJobId)