diff --git a/.github/workflows/build-debug.yaml b/.github/workflows/build-debug.yaml index c7bac6dc..da1ebc5c 100644 --- a/.github/workflows/build-debug.yaml +++ b/.github/workflows/build-debug.yaml @@ -3,6 +3,9 @@ on: pull_request: types: [opened, reopened, synchronize] workflow_dispatch: + push: + branches: + - main jobs: BuildDebug: @@ -53,7 +56,7 @@ jobs: - name: Build if: success() - run: ./gradlew --no-daemon app:assembleMeta-AlphaRelease + run: ./gradlew --no-daemon app:assembleAlphaRelease - name: Upload Aritfact (universal) uses: actions/upload-artifact@v4 @@ -61,7 +64,7 @@ jobs: with: name: CMFA Debug Unsigned APK (universal) path: | - app/build/outputs/apk/meta-alpha/release/*-universal-*.apk + app/build/outputs/apk/alpha/release/*-universal-*.apk - name: Upload Aritfact (arm64-v8a) uses: actions/upload-artifact@v4 @@ -69,7 +72,7 @@ jobs: with: name: CMFA Debug Unsigned APK (arm64-v8a) path: | - app/build/outputs/apk/meta-alpha/release/*-arm64-v8a-*.apk + app/build/outputs/apk/alpha/release/*-arm64-v8a-*.apk - name: Upload Aritfact (armeabi-v7a) uses: actions/upload-artifact@v4 @@ -77,7 +80,7 @@ jobs: with: name: CMFA Debug Unsigned APK (armeabi-v7a) path: | - app/build/outputs/apk/meta-alpha/release/*-armeabi-v7a-*.apk + app/build/outputs/apk/alpha/release/*-armeabi-v7a-*.apk - name: Upload Aritfact (x86_64) uses: actions/upload-artifact@v4 @@ -85,7 +88,7 @@ jobs: with: name: CMFA Debug Unsigned APK (x86_64) path: | - app/build/outputs/apk/meta-alpha/release/*-x86_64-*.apk + app/build/outputs/apk/alpha/release/*-x86_64-*.apk - name: Upload Aritfact (x86) uses: actions/upload-artifact@v4 @@ -93,4 +96,4 @@ jobs: with: name: CMFA Debug Unsigned APK (x86) path: | - app/build/outputs/apk/meta-alpha/release/*-x86-*.apk + app/build/outputs/apk/alpha/release/*-x86-*.apk diff --git a/.github/workflows/build-pre-release.yaml b/.github/workflows/build-pre-release.yaml index 4958a140..8e8c8886 100644 --- a/.github/workflows/build-pre-release.yaml +++ b/.github/workflows/build-pre-release.yaml @@ -55,7 +55,7 @@ jobs: - name: Pre-release Build if: success() - run: ./gradlew --no-daemon app:assembleMeta-AlphaRelease + run: ./gradlew --no-daemon app:assembleAlphaRelease # Delete old Prerelease-alpha - uses: dev-drprasad/delete-tag-and-release@v1.1 @@ -76,7 +76,7 @@ jobs: if: ${{ success() }} with: tag_name: Prerelease-alpha - files: app/build/outputs/apk/meta-alpha/release/* + files: app/build/outputs/apk/alpha/release/* prerelease: true generate_release_notes: true diff --git a/build.gradle.kts b/build.gradle.kts index b949cc32..b0cb670a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,15 +74,15 @@ subprojects { productFlavors { flavorDimensions("feature") - create("meta-alpha") { + create("alpha") { isDefault = true dimension = flavorDimensionList[0] - versionNameSuffix = ".Meta-Alpha" + versionNameSuffix = ".Alpha" buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") if (isApp) { - applicationIdSuffix = ".meta" + applicationIdSuffix = ".alpha" } } @@ -103,7 +103,7 @@ subprojects { getByName("meta") { java.srcDirs("src/foss/java") } - getByName("meta-alpha") { + getByName("alpha") { java.srcDirs("src/foss/java") } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index e50230aa..465edb57 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -15,7 +15,7 @@ val golangSource = file("src/main/golang/native") golang { sourceSets { - create("meta-alpha") { + create("alpha") { tags.set(listOf("foss","with_gvisor","cmfa")) srcDir.set(file("src/foss/golang")) } diff --git a/core/src/main/cpp/CMakeLists.txt b/core/src/main/cpp/CMakeLists.txt index b7de87df..82f2a82d 100644 --- a/core/src/main/cpp/CMakeLists.txt +++ b/core/src/main/cpp/CMakeLists.txt @@ -33,7 +33,7 @@ string (REGEX REPLACE "[\n\t\r]" "" COMPILE_TIME ${COMPILE_TIME}) string(REGEX REPLACE "\"" "" COMPILE_TIME ${COMPILE_TIME}) # 生成版本信息 -set(GIT_VERSION "Meta_${CURRENT_BRANCH}_${COMMIT_HASH}_${COMPILE_TIME}") +set(GIT_VERSION "${CURRENT_BRANCH}_${COMMIT_HASH}_${COMPILE_TIME}") message(STATUS "version info = ${GIT_VERSION}") # 去除空格 diff --git a/gradle.properties b/gradle.properties index 287e2163..1ea659d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4g -XX:+UseZGC -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects