From ab43cc1857bd0d3225435f256072e2ecc0e8a47b Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 10:50:56 +0000 Subject: [PATCH 01/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..0bbcb53 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,91 @@ +# This file is a template, and might need editing before it works on your project. +# The following script will work for any project that can be built from command line by msbuild +# It uses powershell shell executor, so you need to add the following line to your config.toml file +# (located in gitlab-runner.exe directory): +# shell = "powershell" +# +# The script is composed of 3 stages: build, test and deploy. +# +# The build stage restores NuGet packages and uses msbuild to build the exe and msi +# One major issue you'll find is that you can't build msi projects from command line +# if you use vdproj. There are workarounds building msi via devenv, but they rarely work +# The best solution is migrating your vdproj projects to WiX, as it can be build directly +# by msbuild. +# +# The test stage runs nunit from command line against Test project inside your solution +# It also saves the resulting TestResult.xml file +# +# The deploy stage copies the exe and msi from build stage to a network drive +# You need to have the network drive mapped as Local System user for gitlab-runner service to see it +# The best way to persist the mapping is via a scheduled task (see: https://stackoverflow.com/a/7867064/1288473), +# running the following batch command: net use P: \\x.x.x.x\Projects /u:your_user your_pass /persistent:yes + + +# place project specific paths in variables to make the rest of the script more generic +variables: + EXE_RELEASE_FOLDER: 'Borepin\bin\Release' + MSI_RELEASE_FOLDER: 'Setup\bin\Release' + TEST_FOLDER: 'Tests\bin\Release' +# DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds' + NUGET_PATH: 'C:\NuGet\nuget.exe' + MSBUILD_PATH: 'C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe' + NUNIT_PATH: 'C:\Program Files (x86)\NUnit.org\nunit-console\nunit3-console.exe' + +stages: + - build + - test + - deploy + +build_job: + stage: build + tags: + - xamarin + - windows +# only: +# - tags # the build process will only be started by git tag commits + script: + # - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies + - '& "$env:MSBUILD_PATH" /p:Configuration=Release' # build the project + artifacts: + expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on + paths: + - '$env:EXE_RELEASE_FOLDER\YourApp.exe' # saving exe to copy to deploy folder + - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder + - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests + +test_job: + stage: test + tags: + - xamarin + - windows +# only: +# - tags + script: + - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"' # running NUnit tests + artifacts: + when: always # save test results even when the task fails + expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on + paths: + - '.\TestResult.xml' # saving NUnit results to copy to deploy folder + dependencies: + - build_job + +# deploy_job: +# stage: deploy +# only: +# - tags +# script: +# # Compose a folder for each release based on commit tag. +# # Assuming your tag is Rev1.0.0.1, and your last commit message is 'First commit' +# # the artifact files will be copied to: +# # P:\Projects\YourApp\Builds\Rev1.0.0.1 - First commit\ +# - '$commitSubject = git log -1 --pretty=%s' +# - '$deployFolder = $($env:DEPLOY_FOLDER) + "\" + $($env:CI_BUILD_TAG) + " - " + $commitSubject + "\"' + +# # xcopy takes care of recursively creating required folders +# - 'xcopy /y ".\$env:EXE_RELEASE_FOLDER\YourApp.exe" "$deployFolder"' +# - 'xcopy /y ".\$env:MSI_RELEASE_FOLDER\YourApp Setup.msi" "$deployFolder"' +# - 'xcopy /y ".\TestResult.xml" "$deployFolder"' +# dependencies: +# - build_job +# - test_job From a63beeddf0c3a04daf2abb89fb78195ac3bb58a2 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 12:12:54 +0000 Subject: [PATCH 02/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bbcb53..a7bd013 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: TEST_FOLDER: 'Tests\bin\Release' # DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds' NUGET_PATH: 'C:\NuGet\nuget.exe' - MSBUILD_PATH: 'C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe' + MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\msbuild.exe' NUNIT_PATH: 'C:\Program Files (x86)\NUnit.org\nunit-console\nunit3-console.exe' stages: From b7d751274a8f508fb252e2c409119aa3238e11d4 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 12:19:50 +0000 Subject: [PATCH 03/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7bd013..30ae68c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,7 @@ variables: TEST_FOLDER: 'Tests\bin\Release' # DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds' NUGET_PATH: 'C:\NuGet\nuget.exe' + DOTNET_PATH: 'C:\Program Files\dotnet\dotnet.exe' MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\msbuild.exe' NUNIT_PATH: 'C:\Program Files (x86)\NUnit.org\nunit-console\nunit3-console.exe' @@ -44,7 +45,7 @@ build_job: # only: # - tags # the build process will only be started by git tag commits script: - # - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies + - '& "$env:DOTNET_PATH" restore' # restore Nuget dependencies - '& "$env:MSBUILD_PATH" /p:Configuration=Release' # build the project artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on From dc25470c8c8c9a99d1901a4ef722a71a48dea172 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 12:34:16 +0000 Subject: [PATCH 04/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30ae68c..82e1062 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ build_job: # only: # - tags # the build process will only be started by git tag commits script: - - '& "$env:DOTNET_PATH" restore' # restore Nuget dependencies + - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - '& "$env:MSBUILD_PATH" /p:Configuration=Release' # build the project artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on From 1186b8f22560d71df7d4e758397d0a518de8d770 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 13:22:34 +0000 Subject: [PATCH 05/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82e1062..58917b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,11 +46,11 @@ build_job: # - tags # the build process will only be started by git tag commits script: - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /p:Configuration=Release' # build the project + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin' # build the project artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - '$env:EXE_RELEASE_FOLDER\YourApp.exe' # saving exe to copy to deploy folder + - '$env:EXE_RELEASE_FOLDER\Borepin.exe' # saving exe to copy to deploy folder - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests From b064c071d2f6d0510bf54b0bbecb109a9d97eb6d Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 13:25:21 +0000 Subject: [PATCH 06/24] Update Borepin/Borepin/Borepin.csproj --- Borepin/Borepin/Borepin.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj index 7c81734..477ce23 100644 --- a/Borepin/Borepin/Borepin.csproj +++ b/Borepin/Borepin/Borepin.csproj @@ -1,4 +1,4 @@ - + 4.0 @@ -22,6 +22,7 @@ + @@ -51,4 +52,4 @@ MSBuild:UpdateDesignTimeXaml - \ No newline at end of file + From 744ba1f65cf77d47de81f2af02fc55304c4d074e Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 13:27:38 +0000 Subject: [PATCH 07/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58917b9..53051f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,6 +45,7 @@ build_job: # only: # - tags # the build process will only be started by git tag commits script: + - whoami - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin' # build the project artifacts: From 4de42c89ef789e5dc3cfd0fdd37debb5ef9db83b Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 14:13:05 +0000 Subject: [PATCH 08/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53051f7..8bd9cd8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ stages: - test - deploy -build_job: +build_base: stage: build tags: - xamarin @@ -55,6 +55,24 @@ build_job: - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests +build_UWP: + stage: build + tags: + - xamarin + - windows +# only: +# - tags # the build process will only be started by git tag commits + script: + - whoami + - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin.UWP' # build the project + artifacts: + expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on + paths: + - '$env:EXE_RELEASE_FOLDER\Borepin.exe' # saving exe to copy to deploy folder + - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder + - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests + test_job: stage: test tags: From c462936cdfd1abef77662509b14ec0191966de24 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 14:13:39 +0000 Subject: [PATCH 09/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bd9cd8..91a0e0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,22 +73,22 @@ build_UWP: - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests -test_job: - stage: test - tags: - - xamarin - - windows -# only: -# - tags - script: - - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"' # running NUnit tests - artifacts: - when: always # save test results even when the task fails - expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on - paths: - - '.\TestResult.xml' # saving NUnit results to copy to deploy folder - dependencies: - - build_job +# test_job: +# stage: test +# tags: +# - xamarin +# - windows +# # only: +# # - tags +# script: +# - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"' # running NUnit tests +# artifacts: +# when: always # save test results even when the task fails +# expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on +# paths: +# - '.\TestResult.xml' # saving NUnit results to copy to deploy folder +# dependencies: +# - build_job # deploy_job: # stage: deploy From bdedbf280d365381b7bfd33a4bde77254dda3824 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 14:15:47 +0000 Subject: [PATCH 10/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91a0e0f..d171fd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ build_UWP: script: - whoami - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin.UWP' # build the project + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:UWP' # build the project artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: From cd73c3245431596b9560b4dec96d4ab572cf3c78 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 14:24:40 +0000 Subject: [PATCH 11/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d171fd1..8b38c3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ build_UWP: script: - whoami - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:UWP' # build the project + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_UWP' # build the project artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: From 47632806ec80e2d2080031fe867bdae98484fd70 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 14:42:11 +0000 Subject: [PATCH 12/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b38c3d..cb91ef7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,6 @@ build_base: # only: # - tags # the build process will only be started by git tag commits script: - - whoami - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin' # build the project artifacts: @@ -63,7 +62,6 @@ build_UWP: # only: # - tags # the build process will only be started by git tag commits script: - - whoami - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_UWP' # build the project artifacts: @@ -73,6 +71,22 @@ build_UWP: - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests +build_Android: + stage: build + tags: + - xamarin + - windows +# only: +# - tags # the build process will only be started by git tag commits + script: + - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android /t:PackageForAndroid /t:SignAndroidPackage /p:AndroidKeyStore=True' # build the project + artifacts: + expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on + paths: + - Borepin/Borepin.Android/bin/QA/com.company.borepin-Signed.apk # saving apk to copy to deploy folder + - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests + # test_job: # stage: test # tags: From 3c44482105638a9309e4c50f7a50548ef6d5b8db Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 14:53:32 +0000 Subject: [PATCH 13/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb91ef7..247d4d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ build_Android: # - tags # the build process will only be started by git tag commits script: - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android /t:PackageForAndroid /t:SignAndroidPackage /p:AndroidKeyStore=True' # build the project + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid:SignAndroidPackage /p:AndroidKeyStore=True' # build the project artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: From d63472b27a3cc13984a702af609a8f63551e8b33 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 14:55:40 +0000 Subject: [PATCH 14/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 247d4d7..79fcfb5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ build_Android: # - tags # the build process will only be started by git tag commits script: - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid:SignAndroidPackage /p:AndroidKeyStore=True' # build the project + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid /target:Borepin_Android:SignAndroidPackage /p:AndroidKeyStore=True' # build the project artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: From 8d59c6dfd9d16ebaaffdefc3a23817e05f49583a Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 15:02:17 +0000 Subject: [PATCH 15/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79fcfb5..41b3fe9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,11 +80,11 @@ build_Android: # - tags # the build process will only be started by git tag commits script: - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid /target:Borepin_Android:SignAndroidPackage /p:AndroidKeyStore=True' # build the project + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid ' # build the project /target:Borepin_Android:SignAndroidPackage /p:AndroidKeyStore=True artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - Borepin/Borepin.Android/bin/QA/com.company.borepin-Signed.apk # saving apk to copy to deploy folder + - Borepin/Borepin.Android/bin/Release/com.companyname.borepin.apk # saving apk to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests # test_job: From 3b332c11ee57f86fab840634c39f2aa0a8d387b0 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 15:08:43 +0000 Subject: [PATCH 16/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41b3fe9..fe42d47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ build_Android: # - tags # the build process will only be started by git tag commits script: - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid ' # build the project /target:Borepin_Android:SignAndroidPackage /p:AndroidKeyStore=True + - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid /target:Borepin_Android:SignAndroidPackage' # build the project /p:AndroidKeyStore=True artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: From 1640a410ff9d1175387dbc9d4c12e3232c583dab Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 15:09:15 +0000 Subject: [PATCH 17/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe42d47..ea47fbc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,7 @@ build_Android: artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - Borepin/Borepin.Android/bin/Release/com.companyname.borepin.apk # saving apk to copy to deploy folder + - Borepin/Borepin.Android/bin/Release/ # saving apk to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests # test_job: From bb4bfedf53b15d961727dba52d381a2601914e17 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 15:41:21 +0000 Subject: [PATCH 18/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea47fbc..7730298 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ # place project specific paths in variables to make the rest of the script more generic variables: EXE_RELEASE_FOLDER: 'Borepin\bin\Release' - MSI_RELEASE_FOLDER: 'Setup\bin\Release' + UWP_RELEASE_FOLDER: 'Borepin\Borepin.UWP\ TEST_FOLDER: 'Tests\bin\Release' # DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds' NUGET_PATH: 'C:\NuGet\nuget.exe' @@ -87,6 +87,23 @@ build_Android: - Borepin/Borepin.Android/bin/Release/ # saving apk to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests +build_iOS: + stage: build + tags: + - xamarin + - windows +# only: +# - tags # the build process will only be started by git tag commits + script: + - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies + - '& "$env:MSBUILD_PATH" /t:Borepin.iOS /p:Configuration=Release /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True + artifacts: + expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on + paths: + - Borepin/Borepin.iOS/bin/iPhone/Release/Borepin.ipa + - Borepin/Borepin.iOS/bin/iPhone/Release/Borepin.app.dSYM + - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests + # test_job: # stage: test # tags: From bdd545611e11b3923d456133a67f2ebcec10f470 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 15:45:25 +0000 Subject: [PATCH 19/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7730298..1b3b008 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,8 +23,8 @@ # place project specific paths in variables to make the rest of the script more generic variables: - EXE_RELEASE_FOLDER: 'Borepin\bin\Release' - UWP_RELEASE_FOLDER: 'Borepin\Borepin.UWP\ + LIB_RELEASE_FOLDER: 'Borepin\Borepin\bin\Release' + UWP_RELEASE_FOLDER: 'Borepin\Borepin.UWP\bin\x86\Release' TEST_FOLDER: 'Tests\bin\Release' # DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds' NUGET_PATH: 'C:\NuGet\nuget.exe' @@ -50,8 +50,7 @@ build_base: artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - '$env:EXE_RELEASE_FOLDER\Borepin.exe' # saving exe to copy to deploy folder - - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder + - '$env:LIB_RELEASE_FOLDER' # saving exe to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests build_UWP: @@ -67,8 +66,7 @@ build_UWP: artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - '$env:EXE_RELEASE_FOLDER\Borepin.exe' # saving exe to copy to deploy folder - - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder + - '$env:UWP_RELEASE_FOLDER' # saving exe to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests build_Android: @@ -84,7 +82,7 @@ build_Android: artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - Borepin/Borepin.Android/bin/Release/ # saving apk to copy to deploy folder + - Borepin/Borepin.Android/bin/Release/com.companyname.borepin-Signed.apk # saving apk to copy to deploy folder - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests build_iOS: From 1afeb7235c99fac6c57f992bbe1618defec49108 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 15:46:35 +0000 Subject: [PATCH 20/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b3b008..6fff167 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,13 +88,12 @@ build_Android: build_iOS: stage: build tags: - - xamarin - - windows + - macos # only: # - tags # the build process will only be started by git tag commits script: - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /t:Borepin.iOS /p:Configuration=Release /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True + - '& "$env:MSBUILD_PATH" /t:Borepin_iOS /p:Configuration=Release /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: From 904d8da6fc4f0b07cef8a53ded69088ddaf9e417 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 15:48:49 +0000 Subject: [PATCH 21/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fff167..5e4663b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,8 +92,8 @@ build_iOS: # only: # - tags # the build process will only be started by git tag commits script: - - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies - - '& "$env:MSBUILD_PATH" /t:Borepin_iOS /p:Configuration=Release /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True + - 'nuget restore' # restore Nuget dependencies + - 'msbuild /t:Borepin_iOS /p:Configuration=Release /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: From f79e6dad85f30306704a0c8862768163c4ea51c0 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 16:08:58 +0000 Subject: [PATCH 22/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e4663b..c2641fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,12 +93,12 @@ build_iOS: # - tags # the build process will only be started by git tag commits script: - 'nuget restore' # restore Nuget dependencies - - 'msbuild /t:Borepin_iOS /p:Configuration=Release /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True + - 'msbuild /t:Borepin_iOS /p:Configuration=Debug /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - Borepin/Borepin.iOS/bin/iPhone/Release/Borepin.ipa - - Borepin/Borepin.iOS/bin/iPhone/Release/Borepin.app.dSYM + - Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.ipa + - Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.app.dSYM - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests # test_job: From 14b267a45caba83b1ffda4527f27b82316e442a9 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 16:19:25 +0000 Subject: [PATCH 23/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2641fa..5e4663b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,12 +93,12 @@ build_iOS: # - tags # the build process will only be started by git tag commits script: - 'nuget restore' # restore Nuget dependencies - - 'msbuild /t:Borepin_iOS /p:Configuration=Debug /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True + - 'msbuild /t:Borepin_iOS /p:Configuration=Release /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.ipa - - Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.app.dSYM + - Borepin/Borepin.iOS/bin/iPhone/Release/Borepin.ipa + - Borepin/Borepin.iOS/bin/iPhone/Release/Borepin.app.dSYM - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests # test_job: From 89e2b3efda1cf58859cee390723b08e0b49258a2 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 17 Sep 2020 16:52:26 +0000 Subject: [PATCH 24/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e4663b..c2641fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,12 +93,12 @@ build_iOS: # - tags # the build process will only be started by git tag commits script: - 'nuget restore' # restore Nuget dependencies - - 'msbuild /t:Borepin_iOS /p:Configuration=Release /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True + - 'msbuild /t:Borepin_iOS /p:Configuration=Debug /p:Platform=iPhone /p:ArchiveOnBuild=true' # build the project /p:AndroidKeyStore=True artifacts: expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on paths: - - Borepin/Borepin.iOS/bin/iPhone/Release/Borepin.ipa - - Borepin/Borepin.iOS/bin/iPhone/Release/Borepin.app.dSYM + - Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.ipa + - Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.app.dSYM - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests # test_job: