From 3b684cae47cc87071caa1f8fb4c5c7b1b924d3bf Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Mon, 28 May 2018 09:15:21 +0200 Subject: [PATCH 01/10] Fix first problems when compiling on linux --- Integreat/Integreat.Droid/Properties/AndroidManifest.xml | 2 +- Integreat/Integreat.Droid/Resources/values/styles.xml | 3 +-- Integreat/Integreat.Localization/Integreat.Localization.csproj | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Integreat/Integreat.Droid/Properties/AndroidManifest.xml b/Integreat/Integreat.Droid/Properties/AndroidManifest.xml index 5ef267e4..76f9f49d 100644 --- a/Integreat/Integreat.Droid/Properties/AndroidManifest.xml +++ b/Integreat/Integreat.Droid/Properties/AndroidManifest.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/Integreat/Integreat.Droid/Resources/values/styles.xml b/Integreat/Integreat.Droid/Resources/values/styles.xml index 8d8adcce..59ee514f 100644 --- a/Integreat/Integreat.Droid/Resources/values/styles.xml +++ b/Integreat/Integreat.Droid/Resources/values/styles.xml @@ -24,6 +24,5 @@ - \ No newline at end of file + diff --git a/Integreat/Integreat.Localization/Integreat.Localization.csproj b/Integreat/Integreat.Localization/Integreat.Localization.csproj index 263fbb95..70253d65 100644 --- a/Integreat/Integreat.Localization/Integreat.Localization.csproj +++ b/Integreat/Integreat.Localization/Integreat.Localization.csproj @@ -103,4 +103,4 @@ --> - \ No newline at end of file + From 6c4fbadc224593f1e7086f80ddefaac144af0187 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 25 Jul 2018 13:52:53 +0200 Subject: [PATCH 02/10] Add jenkins file --- Jenkinsfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..3281f78b --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,12 @@ +pipeline { + agent any + + stages { + stage('Build') { + steps { + sh 'mkir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' + sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/"' + } + } + } +} From b5d4dc34edf848f17e01dfa541e13d656be67623 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 25 Jul 2018 13:55:27 +0200 Subject: [PATCH 03/10] Fix mkdir command --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3281f78b..4059bd5e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stages { stage('Build') { steps { - sh 'mkir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' + sh 'mkdir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/"' } } From 6f964ec3965a8a0e7cdab792c483e055a1fbe7b0 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 25 Jul 2018 14:04:41 +0200 Subject: [PATCH 04/10] Try to run twice, because it fails the first time --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4059bd5e..c9f7e4ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,7 @@ pipeline { stage('Build') { steps { sh 'mkdir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' + sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" || true' sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/"' } } From 7b4644621f59514ba7a8a3bcaf69bf035a8c1af8 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 25 Jul 2018 14:23:29 +0200 Subject: [PATCH 05/10] Create artifacts --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c9f7e4ef..0808b44d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,8 +6,13 @@ pipeline { steps { sh 'mkdir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" || true' - sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/"' + sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" /t:Build;Sign' } } + post { + always { + archiveArtifacts artifacts: 'Integreat/Integreat.Droid/bin/Debug/*.apk', fingerprint: true + } + } } } From 7eb82d22820ef6cf134cbe5519b833923b95a1f7 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 25 Jul 2018 14:25:05 +0200 Subject: [PATCH 06/10] Fix jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0808b44d..ee8eb58b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,10 +9,10 @@ pipeline { sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" /t:Build;Sign' } } + } post { always { archiveArtifacts artifacts: 'Integreat/Integreat.Droid/bin/Debug/*.apk', fingerprint: true } } - } } From 2073a6cfa621cb6aec0449da8e0655447ea86f71 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 25 Jul 2018 14:34:55 +0200 Subject: [PATCH 07/10] Fix msbuild build --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee8eb58b..d2b6c3f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { steps { sh 'mkdir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" || true' - sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" /t:Build;Sign' + sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" /t:Build' } } } From fa7635b15a4cfd09f0cc8b855456a4354834372a Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 25 Jul 2018 14:41:07 +0200 Subject: [PATCH 08/10] Fix msbuild build --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d2b6c3f4..96fab2d6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { steps { sh 'mkdir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" || true' - sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" /t:Build' + sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" /t:Build;CopyFilesToOutputDirectory' } } } From 7e690711613ddc9710f850b0e3120875f74e3c9d Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 25 Jul 2018 14:54:38 +0200 Subject: [PATCH 09/10] Fix build --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 96fab2d6..3e3af985 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { steps { sh 'mkdir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" || true' - sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" /t:Build;CopyFilesToOutputDirectory' + sh 'msbuild Integreat/Integreat.Droid/Integreat.Droid.csproj /p:AndroidSdkDirectory="/opt/android-sdk/" /target:SignAndroidPackage' } } } From e0b62a4a9a8da74a52d14530e21897cacd457617 Mon Sep 17 00:00:00 2001 From: Ricardo Krause Date: Fri, 21 Sep 2018 17:37:43 +0200 Subject: [PATCH 10/10] Update Jenkinsfile * change to nuget restore * change to release build --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e3af985..e5e4b15a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,15 +4,15 @@ pipeline { stages { stage('Build') { steps { - sh 'mkdir packages && cd packages && nuget install ../Integreat/Integreat.Droid/packages.config' + sh 'mkdir packages && cd packages && nuget restore Integreat.sln' sh 'msbuild Integreat.sln /p:AndroidSdkDirectory="/opt/android-sdk/" || true' - sh 'msbuild Integreat/Integreat.Droid/Integreat.Droid.csproj /p:AndroidSdkDirectory="/opt/android-sdk/" /target:SignAndroidPackage' + sh 'msbuild Integreat/Integreat.Droid/Integreat.Droid.csproj /p:Configuration=Release /p:AndroidSdkDirectory="/opt/android-sdk/" /target:SignAndroidPackage' } } } post { always { - archiveArtifacts artifacts: 'Integreat/Integreat.Droid/bin/Debug/*.apk', fingerprint: true + archiveArtifacts artifacts: 'Integreat/Integreat.Droid/bin/Release/*.apk', fingerprint: true } } }