feat: release模式制品版本号标识

2024-10-11 20:15:52 +08:00 · 2024-10-11 20:15:52 +08:00 · cc3a76e2b5
commit cc3a76e2b5
parent dc72af9936
3 changed files with 31 additions and 25 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -87,14 +87,14 @@ create-release:
    - export StarLock_VERSION=${CI_COMMIT_TAG#*-}
    - echo "Uploading StarLock-${StarLock_VERSION} packages to
      ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/StarLock-${StarLock_VERSION}-*"
-    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/app-xhj-release.apk
-      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/app-xhj-release.apk"'
-    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/app-sky-release.apk
-      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/app-sky-release.apk"'
-    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/app-starlock-release-xhj.ipa
-      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/app-starlock-release-xhj.ipa"'
-    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/app-starlock-release-sky.ipa
-          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/app-starlock-release-sky.ipa"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/app-starlock-release-xhj-${CI_COMMIT_TAG}.apk
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/app-starlock-release-xhj-${CI_COMMIT_TAG}.apk"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/app-starlock-release-sky-${CI_COMMIT_TAG}.apk
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/app-starlock-release-sky-${CI_COMMIT_TAG}.apk"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/app-starlock-release-xhj-${CI_COMMIT_TAG}.ipa
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/app-starlock-release-xhj-${CI_COMMIT_TAG}.ipa"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/app-starlock-release-sky-${CI_COMMIT_TAG}.ipa
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/app-starlock-release-sky-${CI_COMMIT_TAG}.ipa"'
  release:
    name: '$CI_COMMIT_TAG'
    description: 'Created Release By GitLab CI/CD'
@ -103,14 +103,14 @@ create-release:
    assets:
      links:
        - name: 'xhj binary package (Android)'
-          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/app-xhj-release.apk'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/app-starlock-release-xhj-${CI_COMMIT_TAG}.apk'
          link_type: 'package'
        - name: 'sky binary package (Android)'
-          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/app-sky-release.apk'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/app-starlock-release-sky-${CI_COMMIT_TAG}.apk'
          link_type: 'package'
        - name: 'xhj binary package (iOS)'
-          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/app-starlock-release-xhj.ipa'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/app-starlock-release-xhj-${CI_COMMIT_TAG}.ipa'
          link_type: 'package'
        - name: 'sky binary package (iOS)'
-          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/app-starlock-release-sky.ipa'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/app-starlock-release-sky-${CI_COMMIT_TAG}.ipa'
          link_type: 'package'
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -52,10 +52,10 @@ android {
        // 这里“debug”不是一个自定义变量，而是一个特定的关键词，凡是使用--debug模式，都会引用到这里
        // 目前看来，debug模式没办法在buildTypes里面按flavors指定编译签名，所有口味的debug模式只能用同一个签名
        debug {
-             storeFile file("starlock.keystore")
-             storePassword '123456'
-             keyAlias = 'starlock'
-             keyPassword '123456'
+            storeFile file("starlock.keystore")
+            storePassword '123456'
+            keyAlias = 'starlock'
+            keyPassword '123456'
 //            storeFile file("xhj.jks")
 //            storePassword 'xhj8872'
 //            keyAlias = 'upload'
@ -146,7 +146,7 @@ android {
    compileSdkVersion flutter.compileSdkVersion
    ndkVersion flutter.ndkVersion

-    lintOptions{
+    lintOptions {
        checkReleaseBuilds false
        abortOnError false
    }
@ -191,7 +191,7 @@ android {
                JPUSH_PKGNAME : "这里不重要，在口味配置",
                //JPush 上注册的包名对应的 Appkey.
                // JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",//--skyAppKey
-                JPUSH_APPKEY : "251fc8074820d122b6de58d2",//--鑫泓佳AppKey
+                JPUSH_APPKEY  : "251fc8074820d122b6de58d2",//--鑫泓佳AppKey
                JPUSH_CHANNEL : "flutter_channel",

                //若不集成厂商通道，可直接跳过以下配置
@ -199,14 +199,14 @@ android {
                // XIAOMI_APPID : "MI-2882303761520287291",
                // XIAOMI_APPKEY : "MI-5352028744291",
                //以下均为鑫泓佳的配置
-                XIAOMI_APPID : "MI-2882303761520314939",
+                XIAOMI_APPID  : "MI-2882303761520314939",
                XIAOMI_APPKEY : "MI-5312031456939",
-                OPPO_APPKEY : "OP-47f668c9943248118502aa58d066393b",
-                OPPO_APPID : "OP-31726001",
-                OPPO_APPSECRET : "OP-05723986bba64183a71530b496922450",
+                OPPO_APPKEY   : "OP-47f668c9943248118502aa58d066393b",
+                OPPO_APPID    : "OP-31726001",
+                OPPO_APPSECRET: "OP-05723986bba64183a71530b496922450",
                // VIVO_APPKEY : "vivo的APPKEY",
                // VIVO_APPID : "vivo的APPID",
-                HONOR_APPID : "110798531", 
+                HONOR_APPID   : "110798531",
        ]
        splits {
            abi {
@ -247,6 +247,12 @@ android {
            productFlavors.xhj.signingConfig signingConfigs.xhj
        }
    }
+
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = "app-starlock-${variant.buildType.name}-${variant.flavorName}-${defaultConfig.versionName}.apk"
+        }
+    }
 }

 flutter {
@ -268,7 +274,7 @@ dependencies {
    //接入OPPO厂商
    implementation 'cn.jiguang.sdk.plugin:oppo:5.2.3'
    //引入 libs 中的 aar，如果项目中有此依赖不需要重复引用
-    implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
    //OPPO 3.1.0 aar 及其以上版本需要添加以下依赖
    implementation 'com.google.code.gson:gson:2.6.2'
    implementation 'commons-codec:commons-codec:1.6'
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@ -135,7 +135,7 @@ platform :ios do
    print_log "gym_scheme_release #{gym_scheme_release}"
    gym_configuration = "Release-#{flavor}"
    print_log "gym_configuration #{gym_configuration}"
-    ipa_default_filename = "app-starlock-release-#{flavor}.ipa"
+    ipa_default_filename = "app-starlock-release-#{flavor}-"+$current_tag+".ipa"
    print_log "ipa_default_filename #{ipa_default_filename}"
    gym(
      scheme: gym_scheme_release,