Merge pull request #3197 from Catrobat/release-0.9.58

Release 0.9.58
Catrobat · Apr 18, 2019 · 34ce3c7 · 34ce3c7
2 parents 541d5d4 + 923df86
commit 34ce3c7
Show file tree

Hide file tree

Showing 555 changed files with 11,497 additions and 16,207 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -98,20 +98,23 @@ pipeline {
                                 // Build the flavors so that they can be installed next independently of older versions.
                                 sh "./gradlew ${useWebTestParameter()} -Pindependent='#$env.BUILD_NUMBER $env.BRANCH_NAME' assembleCatroidDebug ${allFlavoursParameters()}"
 
+                                renameApks("${env.BRANCH_NAME}-${env.BUILD_NUMBER}")
                                 archiveArtifacts '**/*.apk'
                             }
                         }
 
                         stage('Static Analysis') {
                             steps {
-                                sh './gradlew pmd checkstyle lint'
+                                sh './gradlew pmd checkstyle lint detekt'
                             }
 
                             post {
                                 always {
-                                    pmd         canComputeNew: false, canRunOnFailed: true, defaultEncoding: '', healthy: '', pattern: "catroid/build/reports/pmd.xml",        unHealthy: '', unstableTotalAll: '0'
-                                    checkstyle  canComputeNew: false, canRunOnFailed: true, defaultEncoding: '', healthy: '', pattern: "catroid/build/reports/checkstyle.xml", unHealthy: '', unstableTotalAll: '0'
-                                    androidLint canComputeNew: false, canRunOnFailed: true, defaultEncoding: '', healthy: '', pattern: "catroid/build/reports/lint*.xml",      unHealthy: '', unstableTotalAll: '0'
+                                    recordIssues aggregatingResults: true, enabledForFailure: true, qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
+                                                 tools: [androidLintParser(pattern: 'catroid/build/reports/lint*.xml'),
+                                                         checkStyle(pattern: 'catroid/build/reports/checkstyle.xml'),
+                                                         pmdParser(pattern: 'catroid/build/reports/pmd.xml'),
+                                                         detekt(pattern: 'catroid/build/reports/detekt/detekt.xml')]
                                 }
                             }
                         }
@@ -142,6 +145,36 @@ pipeline {
                             }
                         }
 
+                        stage('Legacy Tests') {
+                            steps {
+                                sh '''./gradlew -PenableCoverage -PlogcatFile=legacy_logcat.txt -Pemulator=android19 \
+                                            startEmulator createCatroidDebugAndroidTestCoverageReport \
+                                            -Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.uiespresso.testsuites.ApiLevel19RegressionTestsSuite'''
+                            }
+
+                            post {
+                                always {
+                                    postEmulator 'legacy'
+                                }
+                            }
+                        }
+
+                        stage('Testrunner Tests') {
+                            steps {
+                                sh '''./gradlew -PenableCoverage -PlogcatFile=testrunner_logcat.txt -Pemulator=android24 \
+                                                startEmulator createCatroidDebugAndroidTestCoverageReport \
+                                                -Pandroid.testInstrumentationRunnerArguments.package=org.catrobat.catroid.catrobattestrunner'''
+
+
+                            }
+
+                            post {
+                                always {
+                                    postEmulator 'testrunner'
+                                }
+                            }
+                        }
+
                         stage('Quarantined Tests') {
                             when {
                                 expression { isJobStartedByTimer() }

diff --git a/Jenkinsfile.buildMetadata b/Jenkinsfile.buildMetadata
@@ -27,17 +27,26 @@ pipeline {
         stage('Prepare build') {
             steps {
                 script {
-                    currentBuild.displayName = "#${env.BUILD_NUMBER}"
+                    currentBuild.displayName = "#${env.BUILD_NUMBER} | ${env.flavor} | ${env.gitBranch}"
                 }
             }
         }
 
         stage('Setup Translations') {
             steps {
-                sh '''
-                    set +x
-                    ./gradlew generateCrowdinMetadataCatroid -PcrowdinKey=$crowdinKey
-                '''
+                script {
+                    if (env.flavor == 'Playground') {
+                        sh '''
+                            set +x
+                            ./gradlew generateCrowdinMetadataCatroid -PcrowdinKey=$crowdinKey
+                        '''
+                    } else {
+                        sh '''
+                            set +x
+                            ./gradlew generateCrowdinMetadata${flavor} -PcrowdinKey=$crowdinKey
+                        '''
+                    }
+                }
             }
         }
 
@@ -49,7 +58,15 @@ pipeline {
 
         stage('Create Screenshots') {
             steps {
-                sh "./gradlew generateScreenshotsCatroid"
+                script {
+                    if (env.flavor == 'Playground') {
+                        sh './gradlew generateScreenshotsCatroid'
+                    } else {
+                        sh './gradlew generateScreenshots${flavor}'
+                    }
+                }
+                zip zipFile: 'metadata.zip', archive: false, dir: 'fastlane/metadata'
+                archiveArtifacts artifacts: 'metadata.zip', fingerprint: true
             }
             post {
                 always {
@@ -88,7 +105,7 @@ pipeline {
                 environment name: 'APPROVE_DEPLOY', value: 'yes'
             }
             steps {
-                sh "fastlane android upload_Metadata_Catroid"
+                sh 'fastlane android upload_Metadata_${flavor}'
             }
         }
 
@@ -97,12 +114,24 @@ pipeline {
                 environment name: 'APPROVE_DEPLOY', value: 'yes'
             }
             steps {
-                sh "fastlane android promote_Catroid"
+                script {
+                    if (env.flavor == 'Playground') {
+                        echo 'Playground cannot be promoted to production!'
+                    } else {
+                        // deactivated for testing to not publish by accident
+                        //sh 'fastlane android promote_${flavor}'
+                        echo 'The promotion of the APK is currently deactivated!'
+                    }
+                }
             }
         }
     }
 
     post {
+        always {
+            // clean workspace
+            deleteDir()
+        }
         changed {
             notifyChat()
         }

diff --git a/Jenkinsfile.releaseAPK b/Jenkinsfile.releaseAPK
@@ -27,7 +27,7 @@ pipeline {
         stage('Prepare build') {
             steps {
                 script {
-                    currentBuild.displayName = "#${env.BUILD_NUMBER}"
+                    currentBuild.displayName = "#${env.BUILD_NUMBER} | ${env.flavor} | ${env.gitBranch}"
                 }
             }
         }
@@ -36,17 +36,46 @@ pipeline {
             steps {
                 // Build, zipalign and sign releasable APK
                 withCredentials([file(credentialsId: 'a925b6e8-b3c6-407e-8cad-65886e330037', variable: 'SIGNING_KEYSTORE')]) {
-                    sh '''
-                        set +x
-                        ./gradlew assembleCatroidSignedRelease \
-                        -PsigningKeystore=${SIGNING_KEYSTORE} \
-                        -PsigningKeystorePassword=$signingKeystorePassword \
-                        -PsigningKeyAlias=$signingKeyAlias \
-                        -PsigningKeyPassword=$signingKeyPassword \
-                        -PfirebaseApiKey=$firebaseApiKey \
-                        -PfabricApiKey=$fabricApiKey \
-                        -PfabricApiSecret=$fabricApiSecret
-                    '''
+                    script {
+                        if (env.flavor == 'All') {
+                            sh '''
+                                set +x
+                                ./gradlew assembleSignedRelease \
+                                -PsigningKeystore=${SIGNING_KEYSTORE} \
+                                -PsigningKeystorePassword=$signingKeystorePassword \
+                                -PsigningKeyAlias=$signingKeyAlias \
+                                -PsigningKeyPassword=$signingKeyPassword \
+                                -PfirebaseApiKey=$firebaseApiKey \
+                                -PfabricApiKey=$fabricApiKey \
+                                -PfabricApiSecret=$fabricApiSecret
+                            '''
+                        } else if (env.flavor == 'Playground') {
+                            sh '''
+                                set +x
+                                ./gradlew assembleCatroidSignedRelease \
+                                -PsigningKeystore=${SIGNING_KEYSTORE} \
+                                -PsigningKeystorePassword=$signingKeystorePassword \
+                                -PsigningKeyAlias=$signingKeyAlias \
+                                -PsigningKeyPassword=$signingKeyPassword \
+                                -PfirebaseApiKey=$firebaseApiKey \
+                                -PfabricApiKey=$fabricApiKey \
+                                -PfabricApiSecret=$fabricApiSecret \
+                                -Pplayground=true
+                            '''
+                        } else {
+                            sh '''
+                                set +x
+                                ./gradlew assemble${flavor}SignedRelease \
+                                -PsigningKeystore=${SIGNING_KEYSTORE} \
+                                -PsigningKeystorePassword=$signingKeystorePassword \
+                                -PsigningKeyAlias=$signingKeyAlias \
+                                -PsigningKeyPassword=$signingKeyPassword \
+                                -PfirebaseApiKey=$firebaseApiKey \
+                                -PfabricApiKey=$fabricApiKey \
+                                -PfabricApiSecret=$fabricApiSecret
+                            '''
+                        }
+                    }
                 }
                 archiveArtifacts artifacts: 'catroid/build/outputs/apk/**/*signedRelease.apk', fingerprint: true
             }
@@ -70,7 +99,18 @@ pipeline {
                 environment name: 'APPROVE_UPLOAD_APK', value: 'yes'
             }
             steps {
-                sh "fastlane android upload_APK_Catroid"
+                script {
+                    if (env.flavor == 'All') {
+                        sh '''
+                            fastlane android upload_APK_Catroid \
+                            fastlane android upload_APK_CreateAtSchool
+                            fastlane android upload_APK_LunaAndCat \
+                            fastlane android upload_APK_Phiro \
+                        '''
+                    } else {
+                        sh 'fastlane android upload_APK_${flavor}'
+                    }
+                }
             }
         }
     }