Skip to content

Commit 43337ea

Browse files
committed
remove redundant 'Meta'
1 parent a197f8f commit 43337ea

File tree

6 files changed

+18
-15
lines changed

6 files changed

+18
-15
lines changed

.github/workflows/build-debug.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ on:
33
pull_request:
44
types: [opened, reopened, synchronize]
55
workflow_dispatch:
6+
push:
7+
branches:
8+
- main
69

710
jobs:
811
BuildDebug:
@@ -53,44 +56,44 @@ jobs:
5356

5457
- name: Build
5558
if: success()
56-
run: ./gradlew --no-daemon app:assembleMeta-AlphaRelease
59+
run: ./gradlew --no-daemon app:assembleAlphaRelease
5760

5861
- name: Upload Aritfact (universal)
5962
uses: actions/upload-artifact@v4
6063
if: ${{ success() }}
6164
with:
6265
name: CMFA Debug Unsigned APK (universal)
6366
path: |
64-
app/build/outputs/apk/meta-alpha/release/*-universal-*.apk
67+
app/build/outputs/apk/alpha/release/*-universal-*.apk
6568
6669
- name: Upload Aritfact (arm64-v8a)
6770
uses: actions/upload-artifact@v4
6871
if: ${{ success() }}
6972
with:
7073
name: CMFA Debug Unsigned APK (arm64-v8a)
7174
path: |
72-
app/build/outputs/apk/meta-alpha/release/*-arm64-v8a-*.apk
75+
app/build/outputs/apk/alpha/release/*-arm64-v8a-*.apk
7376
7477
- name: Upload Aritfact (armeabi-v7a)
7578
uses: actions/upload-artifact@v4
7679
if: ${{ success() }}
7780
with:
7881
name: CMFA Debug Unsigned APK (armeabi-v7a)
7982
path: |
80-
app/build/outputs/apk/meta-alpha/release/*-armeabi-v7a-*.apk
83+
app/build/outputs/apk/alpha/release/*-armeabi-v7a-*.apk
8184
8285
- name: Upload Aritfact (x86_64)
8386
uses: actions/upload-artifact@v4
8487
if: ${{ success() }}
8588
with:
8689
name: CMFA Debug Unsigned APK (x86_64)
8790
path: |
88-
app/build/outputs/apk/meta-alpha/release/*-x86_64-*.apk
91+
app/build/outputs/apk/alpha/release/*-x86_64-*.apk
8992
9093
- name: Upload Aritfact (x86)
9194
uses: actions/upload-artifact@v4
9295
if: ${{ success() }}
9396
with:
9497
name: CMFA Debug Unsigned APK (x86)
9598
path: |
96-
app/build/outputs/apk/meta-alpha/release/*-x86-*.apk
99+
app/build/outputs/apk/alpha/release/*-x86-*.apk

.github/workflows/build-pre-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: Pre-release Build
5757
if: success()
58-
run: ./gradlew --no-daemon app:assembleMeta-AlphaRelease
58+
run: ./gradlew --no-daemon app:assembleAlphaRelease
5959

6060
# Delete old Prerelease-alpha
6161
- uses: dev-drprasad/delete-tag-and-release@v1.1
@@ -76,7 +76,7 @@ jobs:
7676
if: ${{ success() }}
7777
with:
7878
tag_name: Prerelease-alpha
79-
files: app/build/outputs/apk/meta-alpha/release/*
79+
files: app/build/outputs/apk/alpha/release/*
8080
prerelease: true
8181
generate_release_notes: true
8282

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ subprojects {
7474
productFlavors {
7575
flavorDimensions("feature")
7676

77-
create("meta-alpha") {
77+
create("alpha") {
7878
isDefault = true
7979
dimension = flavorDimensionList[0]
80-
versionNameSuffix = ".Meta-Alpha"
80+
versionNameSuffix = ".Alpha"
8181

8282
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
8383

8484
if (isApp) {
85-
applicationIdSuffix = ".meta"
85+
applicationIdSuffix = ".alpha"
8686
}
8787
}
8888

@@ -103,7 +103,7 @@ subprojects {
103103
getByName("meta") {
104104
java.srcDirs("src/foss/java")
105105
}
106-
getByName("meta-alpha") {
106+
getByName("alpha") {
107107
java.srcDirs("src/foss/java")
108108
}
109109
}

core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ val golangSource = file("src/main/golang/native")
1515

1616
golang {
1717
sourceSets {
18-
create("meta-alpha") {
18+
create("alpha") {
1919
tags.set(listOf("foss","with_gvisor","cmfa"))
2020
srcDir.set(file("src/foss/golang"))
2121
}

core/src/main/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ string (REGEX REPLACE "[\n\t\r]" "" COMPILE_TIME ${COMPILE_TIME})
3333
string(REGEX REPLACE "\"" "" COMPILE_TIME ${COMPILE_TIME})
3434

3535
# 生成版本信息
36-
set(GIT_VERSION "Meta_${CURRENT_BRANCH}_${COMMIT_HASH}_${COMPILE_TIME}")
36+
set(GIT_VERSION "${CURRENT_BRANCH}_${COMMIT_HASH}_${COMPILE_TIME}")
3737
message(STATUS "version info = ${GIT_VERSION}")
3838

3939
# 去除空格

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9-
org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -Dfile.encoding=UTF-8
9+
org.gradle.jvmargs=-Xmx4g -XX:+UseZGC -Dfile.encoding=UTF-8
1010
# When configured, Gradle will run in incubating parallel mode.
1111
# This option should only be used with decoupled projects. More details, visit
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

0 commit comments

Comments
 (0)