Merge branch '2023.3' into '2023.3-dev'
# Conflicts: # nhterm/src/main/AndroidManifest.xml
This commit is contained in:
commit
02bbca8a57
@ -6,8 +6,8 @@ stages:
|
||||
before_script:
|
||||
- export GRADLE_USER_HOME=$(pwd)/.gradle
|
||||
- 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_CODE=`egrep '^[[:blank:]]+versionCode[[: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=' ./build.gradle | awk -F '=' '{print $2}'`
|
||||
- export APK_NAME="${PACKAGE}_${VERSION_CODE}"
|
||||
- chmod +x ./gradlew
|
||||
- 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
|
||||
- ls result/
|
||||
- if [ -d /tmp/result ]; then cp result/* /tmp/result; fi # Copy it to host if run locally
|
||||
|
||||
|
||||
artifacts:
|
||||
name: "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"
|
||||
paths:
|
||||
|
@ -10,6 +10,14 @@ buildscript {
|
||||
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 = [
|
||||
"annotations" : "androidx.annotation:annotation:1.0.0",
|
||||
"appcompat-v7" : "androidx.appcompat:appcompat:1.0.0",
|
||||
|
@ -8,8 +8,8 @@ android {
|
||||
applicationId "com.offsec.nhterm"
|
||||
minSdkVersion rootProject.ext.android.MIN_SDK_VERSION
|
||||
targetSdkVersion rootProject.ext.android.TARGET_SDK_VERSION
|
||||
versionCode 20232
|
||||
versionName "2023.2-dev"
|
||||
versionCode rootProject.ext.versionCode
|
||||
versionName rootProject.ext.versionName
|
||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||
resConfigs 'zh-rCN', 'zh-rTW'
|
||||
externalNativeBuild {
|
||||
|
Loading…
Reference in New Issue
Block a user