Merge pull request #1103 from ThorstenBandel/PAINTROID-423_Fix_paintr…

…oid_filenames PAINTROID-423 Fix paintroid filenames
Catrobat · Jun 2, 2022 · 537bd84 · 537bd84
2 parents b3a4287 + 4f32aa7
commit 537bd84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -64,6 +64,7 @@ pipeline {
         stage('Build Debug-APK') {
             steps {
                 sh "./gradlew -Pindependent='#$env.BUILD_NUMBER $env.BRANCH_NAME' assembleDebug"
+                renameApks("${env.BRANCH_NAME}-${env.BUILD_NUMBER}")
                 archiveArtifacts 'app/build/outputs/apk/debug/paintroid-debug*.apk'
                 plot csvFileName: 'dexcount.csv', csvSeries: [[displayTableFlag: false, exclusionValues: '', file: 'Paintroid/build/outputs/dexcount/*.csv', inclusionFlag: 'OFF', url: '']], group: 'APK Stats', numBuilds: '180', style: 'line', title: 'dexcount'
             }
@@ -81,12 +82,13 @@ pipeline {
                 sh 'rm -rf Catroid; mkdir Catroid'
                 dir('Catroid') {
                     git branch: params.CATROID_BRANCH, url: 'https://github.com/Catrobat/Catroid.git'
-                    sh 'rm -f catroid/src/main/libs/*.aar'
-                    sh 'mv -f ../colorpicker/build/outputs/aar/colorpicker-debug.aar catroid/src/main/libs/colorpicker-LOCAL.aar'
-                    sh 'mv -f ../Paintroid/build/outputs/aar/Paintroid-debug.aar catroid/src/main/libs/Paintroid-LOCAL.aar'
-
-                    archiveArtifacts 'catroid/src/main/libs/colorpicker-LOCAL.aar'
-                    archiveArtifacts 'catroid/src/main/libs/Paintroid-LOCAL.aar'
+                    sh "rm -f catroid/src/main/libs/*.aar"
+                    sh "mv -f ../colorpicker/build/outputs/aar/colorpicker-debug.aar catroid/src/main/libs/colorpicker-LOCAL.aar"
+                    sh "mv -f ../Paintroid/build/outputs/aar/Paintroid-debug.aar catroid/src/main/libs/Paintroid-LOCAL.aar"
+                }
+                renameApks("${env.BRANCH_NAME}-${env.BUILD_NUMBER}")
+                dir('Catroid') {
+                    archiveArtifacts "catroid/src/main/libs/*.aar"
                     sh "./gradlew assembleCatroidDebug"
                     archiveArtifacts 'catroid/build/outputs/apk/catroid/debug/catroid-catroid-debug.apk'
                 }

diff --git a/app/build.gradle b/app/build.gradle
@@ -83,23 +83,6 @@ android {
         signedRelease {
             signingConfig signingConfigs.signedRelease
         }
-        debug {
-            def branchName = System.getenv("BRANCH_NAME")
-            def buildNumber = System.getenv("BUILD_NUMBER")
-
-            //only rename when env is setup via jenkins
-            if (branchName && buildNumber) {
-                //loop over all variants is necessary to expose outputFileName variable
-                android.applicationVariants.all { variant ->
-                    if (variant.name == "debug") {
-                        variant.outputs.all { output ->
-                            def fileName = "${getProperty("archivesBaseName")}-debug-$branchName-${buildNumber}.apk"
-                            outputFileName = fileName
-                        }
-                    }
-                }
-            }
-        }
     }
 }