Fixed version code placement #7
This commit is contained in:
parent
3fd1a67517
commit
823dddda90
@ -6,8 +6,8 @@ stages:
|
|||||||
before_script:
|
before_script:
|
||||||
- export GRADLE_USER_HOME=$(pwd)/.gradle
|
- export GRADLE_USER_HOME=$(pwd)/.gradle
|
||||||
- export PACKAGE=`egrep '^[[:blank:]]+package' ./nhterm/src/main/AndroidManifest.xml | awk -F'[=>]' '{print $2}' | sed s/\"//g`
|
- export PACKAGE=`egrep '^[[:blank:]]+package' ./nhterm/src/main/AndroidManifest.xml | awk -F'[=>]' '{print $2}' | sed s/\"//g`
|
||||||
- export VERSION_NAME=`egrep '^[[:blank:]]+versionName[[:blank:]]' ./nhterm/build.gradle | awk '{print $2}' | sed s/\"//g`
|
- export VERSION_NAME=`egrep '^[[:blank:]]+versionName=' ./build.gradle | awk -F '"' '{print $2}'`
|
||||||
- export VERSION_CODE=`egrep '^[[:blank:]]+versionCode[[:blank:]]' ./nhterm/build.gradle | awk '{print $2}' | sed s/\"//g`
|
- export VERSION_CODE=`egrep '^[[:blank:]]+versionCode=' ./build.gradle | awk -F '=' '{print $2}'`
|
||||||
- export APK_NAME="${PACKAGE}_${VERSION_CODE}"
|
- export APK_NAME="${PACKAGE}_${VERSION_CODE}"
|
||||||
- chmod +x ./gradlew
|
- chmod +x ./gradlew
|
||||||
- echo $PACKAGE
|
- echo $PACKAGE
|
||||||
@ -30,7 +30,7 @@ before_script:
|
|||||||
- mv ./nhterm/build/outputs/apk/debug/nhterm-debug.apk result/${APK_NAME}-debug.apk || mv ./nhterm/build/outputs/apk/debug/*-debug.apk result/${APK_NAME}-debug.apk
|
- mv ./nhterm/build/outputs/apk/debug/nhterm-debug.apk result/${APK_NAME}-debug.apk || mv ./nhterm/build/outputs/apk/debug/*-debug.apk result/${APK_NAME}-debug.apk
|
||||||
- ls result/
|
- ls result/
|
||||||
- if [ -d /tmp/result ]; then cp result/* /tmp/result; fi # Copy it to host if run locally
|
- if [ -d /tmp/result ]; then cp result/* /tmp/result; fi # Copy it to host if run locally
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
name: "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"
|
name: "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"
|
||||||
paths:
|
paths:
|
||||||
|
@ -10,6 +10,14 @@ buildscript {
|
|||||||
JUNIT_VERSION : "4.12"
|
JUNIT_VERSION : "4.12"
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
ext {
|
||||||
|
//version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1))
|
||||||
|
//noinspection HighAppVersionCode
|
||||||
|
versionCode=2023030100
|
||||||
|
versionName="2023.3"
|
||||||
|
}
|
||||||
|
|
||||||
ext.deps = [
|
ext.deps = [
|
||||||
"annotations" : "androidx.annotation:annotation:1.0.0",
|
"annotations" : "androidx.annotation:annotation:1.0.0",
|
||||||
"appcompat-v7" : "androidx.appcompat:appcompat:1.0.0",
|
"appcompat-v7" : "androidx.appcompat:appcompat:1.0.0",
|
||||||
|
@ -8,10 +8,8 @@ android {
|
|||||||
applicationId "com.offsec.nhterm"
|
applicationId "com.offsec.nhterm"
|
||||||
minSdkVersion rootProject.ext.android.MIN_SDK_VERSION
|
minSdkVersion rootProject.ext.android.MIN_SDK_VERSION
|
||||||
targetSdkVersion rootProject.ext.android.TARGET_SDK_VERSION
|
targetSdkVersion rootProject.ext.android.TARGET_SDK_VERSION
|
||||||
//version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1))
|
versionCode rootProject.ext.versionCode
|
||||||
//noinspection HighAppVersionCode
|
versionName rootProject.ext.versionName
|
||||||
versionCode 2023030100
|
|
||||||
versionName "2023.3"
|
|
||||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||||
resConfigs 'zh-rCN', 'zh-rTW'
|
resConfigs 'zh-rCN', 'zh-rTW'
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
|
Loading…
Reference in New Issue
Block a user