GitHub-Mirror/riotX-android
1
0
Fork 1
mirror of https://github.com/vector-im/riotX-android synced 2025-10-06 00:02:48 +02:00
Code Issues Releases Wiki Activity

Remove usage of Buildkite.

Browse Source 
Build number is just removed.
Related script will need to be updated separately.
This commit is contained in:
Benoit Marty
2022-11-14 15:02:01 +01:00
committed by Benoit Marty
parent ae996ae197
commit 9ca7415f5a
18 changed files with 26 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vector-app/build.gradle
View File

@@ -76,15 +76,8 @@ static def gitRevisionDate() {
}
static def gitBranchName() {
def fromEnv = System.env.BUILDKITE_BRANCH as String ?: ""
if (!fromEnv.isEmpty()) {
return fromEnv
} else {
// Note: this command return "HEAD" on Buildkite, so use the system env 'BUILDKITE_BRANCH' content first
def cmd = "git rev-parse --abbrev-ref HEAD"
return cmd.execute().text.trim()
}
def cmd = "git rev-parse --abbrev-ref HEAD"
return cmd.execute().text.trim()
}
// For Google Play build, build on any other branch than main will have a "-dev" suffix
@@ -122,8 +115,6 @@ project.android.buildTypes.all { buildType ->
// 64 bits have greater value than 32 bits
ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].withDefault { 0 }
def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0
android {
namespace "im.vector.application"
// Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use
@@ -155,7 +146,6 @@ android {
buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\""
buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\""
buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

4
vector-app/signature/README.md
View File

@@ -1,10 +1,6 @@
## Debug signature
Buildkite CI tool uses docker images to build the Android application, and it looks like the debug signature is changed at each build.
So it's not possible for user to upgrade the application with the last build from buildkite without uninstalling the application.
This folder contains a debug signature, and the debug build will uses this signature to build the APK.
The validity of the signature is 30 years. So it has to be replaced before June 2049 :).

2
vector-app/src/main/java/im/vector/app/VectorApplication.kt
View File

@@ -239,7 +239,7 @@ class VectorApplication :
}
private fun logInfo() {
val appVersion = versionProvider.getVersion(longFormat = true, useBuildNumber = true)
val appVersion = versionProvider.getVersion(longFormat = true)
val sdkVersion = Matrix.getSdkVersion()
val date = SimpleDateFormat("MM-dd HH:mm:ss.SSSZ", Locale.US).format(Date())

1
vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt
View File

@@ -221,7 +221,6 @@ import javax.inject.Singleton
gitRevision = BuildConfig.GIT_REVISION,
gitRevisionDate = BuildConfig.GIT_REVISION_DATE,
gitBranchName = BuildConfig.GIT_BRANCH_NAME,
buildNumber = BuildConfig.BUILD_NUMBER,
flavorDescription = BuildConfig.FLAVOR_DESCRIPTION,
flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION,
)