Skip to content

Commit 14a8972

Browse files
committed
chore: address comments
1 parent 682aca6 commit 14a8972

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

ci/Jenkinsfile.android

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,16 @@ pipeline {
5555

5656
stage('Build Android APK') {
5757
steps {
58-
sh """
59-
make mobile-clean
60-
make -j${utils.getProcCount()} mobile-build V=3 USE_SYSTEM_NIM=1
61-
"""
58+
sh 'make mobile-clean'
59+
sh 'make -j${utils.getProcCount()} mobile-build V=3 USE_SYSTEM_NIM=1'
6260
}
6361
}
6462

6563
stage('Package APK') {
6664
steps {
67-
sh """
68-
mkdir -p pkg
69-
cp '${env.STATUS_APK}' '${env.STATUS_APK_ARTIFACT}'
70-
ls -la '${env.STATUS_APK_ARTIFACT}'
71-
"""
65+
sh 'mkdir -p pkg'
66+
sh 'cp "${env.STATUS_APK}" "${env.STATUS_APK_ARTIFACT}"'
67+
sh 'ls -la "${env.STATUS_APK_ARTIFACT}"'
7268
}
7369
}
7470

ci/Jenkinsfile.qt-build

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pipeline {
4242
script {
4343
dir("${MOBILE_BUILD_DIR}") {
4444

45-
def image = docker.build(
45+
docker.build(
4646
"${DOCKER_REGISTRY}/${DOCKER_IMAGE_BASE}:${params.DOCKER_TAG}",
4747
"--build-arg QTVER=${params.QT_VERSION} " +
4848
"--build-arg TARGETARCH=amd64 " +
@@ -54,7 +54,7 @@ pipeline {
5454
"--build-arg NIX_VERSION=2.24.11 " +
5555
"--target mobile-build ."
5656
)
57-
57+
5858
env.BUILT_IMAGE = "${DOCKER_REGISTRY}/${DOCKER_IMAGE_BASE}:${params.DOCKER_TAG}"
5959
}
6060
}
@@ -66,8 +66,7 @@ pipeline {
6666
stage('Test Mobile Build Image') {
6767
steps {
6868
script {
69-
def testImage = "${DOCKER_REGISTRY}/${DOCKER_IMAGE_BASE}:${params.DOCKER_TAG}"
70-
docker.image(testImage).inside('--entrypoint=""') {
69+
image(testImage).inside('--entrypoint=""') {
7170
sh "qmake --version"
7271
sh "nim --version"
7372
sh "go version"
@@ -88,7 +87,6 @@ pipeline {
8887
}
8988
steps {
9089
script {
91-
def image = docker.image(env.BUILT_IMAGE)
9290
image.push()
9391
}
9492
}

0 commit comments

Comments
 (0)