From 12c5d4edd3f8ed096fa613a45c62a4f7b96e1b68 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Thu, 16 Sep 2021 21:00:20 +0000
Subject: [PATCH 01/24] Update .gitlab/.gitlab-webide.yml
---
.gitlab/.gitlab-webide.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 .gitlab/.gitlab-webide.yml
diff --git a/.gitlab/.gitlab-webide.yml b/.gitlab/.gitlab-webide.yml
new file mode 100644
index 0000000..8a07c46
--- /dev/null
+++ b/.gitlab/.gitlab-webide.yml
@@ -0,0 +1,4 @@
+terminal:
+ # This can be any image that has the necessary runtime environment for your project.
+ image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
+ script: bash
From 8debd59fda1377aec72f0b838a797c4d474782d1 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Thu, 16 Sep 2021 21:01:45 +0000
Subject: [PATCH 02/24] Update .gitlab/.gitlab-webide.yml
---
.gitlab/.gitlab-webide.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab/.gitlab-webide.yml b/.gitlab/.gitlab-webide.yml
index 8a07c46..bf6f2c0 100644
--- a/.gitlab/.gitlab-webide.yml
+++ b/.gitlab/.gitlab-webide.yml
@@ -1,4 +1,4 @@
terminal:
# This can be any image that has the necessary runtime environment for your project.
image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
- script: bash
+ script: sleep 60
From 41af32fc0c9c073a4b8e95c0a7551e9c2932b3ea Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Thu, 16 Sep 2021 23:24:25 +0200
Subject: [PATCH 03/24] Updated submodule FabAccessAPI/schema
---
FabAccessAPI/schema | 2 +-
Gemfile | 3 +
Gemfile.lock | 213 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 217 insertions(+), 1 deletion(-)
create mode 100644 Gemfile
create mode 100644 Gemfile.lock
diff --git a/FabAccessAPI/schema b/FabAccessAPI/schema
index 6935947..f1a57c4 160000
--- a/FabAccessAPI/schema
+++ b/FabAccessAPI/schema
@@ -1 +1 @@
-Subproject commit 6935947d9e4569ffb141bdc265e4c08d5a1017e4
+Subproject commit f1a57c44d09b8c21932dfdd2aeb2719d4dcd50eb
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..7a118b4
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..35aeaec
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,213 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ CFPropertyList (3.0.3)
+ addressable (2.8.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ artifactory (3.0.15)
+ atomos (0.1.3)
+ aws-eventstream (1.2.0)
+ aws-partitions (1.502.0)
+ aws-sdk-core (3.121.0)
+ aws-eventstream (~> 1, >= 1.0.2)
+ aws-partitions (~> 1, >= 1.239.0)
+ aws-sigv4 (~> 1.1)
+ jmespath (~> 1.0)
+ aws-sdk-kms (1.48.0)
+ aws-sdk-core (~> 3, >= 3.120.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.103.0)
+ aws-sdk-core (~> 3, >= 3.120.0)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.4)
+ aws-sigv4 (1.4.0)
+ aws-eventstream (~> 1, >= 1.0.2)
+ babosa (1.0.4)
+ claide (1.0.3)
+ colored (1.2)
+ colored2 (3.1.2)
+ commander (4.6.0)
+ highline (~> 2.0.0)
+ declarative (0.0.20)
+ digest-crc (0.6.4)
+ rake (>= 12.0.0, < 14.0.0)
+ domain_name (0.5.20190701)
+ unf (>= 0.0.5, < 1.0.0)
+ dotenv (2.7.6)
+ emoji_regex (3.2.2)
+ excon (0.85.0)
+ faraday (1.7.2)
+ faraday-em_http (~> 1.0)
+ faraday-em_synchrony (~> 1.0)
+ faraday-excon (~> 1.1)
+ faraday-httpclient (~> 1.0.1)
+ faraday-net_http (~> 1.0)
+ faraday-net_http_persistent (~> 1.1)
+ faraday-patron (~> 1.0)
+ faraday-rack (~> 1.0)
+ multipart-post (>= 1.2, < 3)
+ ruby2_keywords (>= 0.0.4)
+ faraday-cookie_jar (0.0.7)
+ faraday (>= 0.8.0)
+ http-cookie (~> 1.0.0)
+ faraday-em_http (1.0.0)
+ faraday-em_synchrony (1.0.0)
+ faraday-excon (1.1.0)
+ faraday-httpclient (1.0.1)
+ faraday-net_http (1.0.1)
+ faraday-net_http_persistent (1.2.0)
+ faraday-patron (1.0.0)
+ faraday-rack (1.0.0)
+ faraday_middleware (1.1.0)
+ faraday (~> 1.0)
+ fastimage (2.2.5)
+ fastlane (2.194.0)
+ CFPropertyList (>= 2.3, < 4.0.0)
+ addressable (>= 2.8, < 3.0.0)
+ artifactory (~> 3.0)
+ aws-sdk-s3 (~> 1.0)
+ babosa (>= 1.0.3, < 2.0.0)
+ bundler (>= 1.12.0, < 3.0.0)
+ colored
+ commander (~> 4.6)
+ dotenv (>= 2.1.1, < 3.0.0)
+ emoji_regex (>= 0.1, < 4.0)
+ excon (>= 0.71.0, < 1.0.0)
+ faraday (~> 1.0)
+ faraday-cookie_jar (~> 0.0.6)
+ faraday_middleware (~> 1.0)
+ fastimage (>= 2.1.0, < 3.0.0)
+ gh_inspector (>= 1.1.2, < 2.0.0)
+ google-apis-androidpublisher_v3 (~> 0.3)
+ google-apis-playcustomapp_v1 (~> 0.1)
+ google-cloud-storage (~> 1.31)
+ highline (~> 2.0)
+ json (< 3.0.0)
+ jwt (>= 2.1.0, < 3)
+ mini_magick (>= 4.9.4, < 5.0.0)
+ multipart-post (~> 2.0.0)
+ naturally (~> 2.2)
+ optparse (~> 0.1.1)
+ plist (>= 3.1.0, < 4.0.0)
+ rubyzip (>= 2.0.0, < 3.0.0)
+ security (= 0.1.3)
+ simctl (~> 1.6.3)
+ terminal-notifier (>= 2.0.0, < 3.0.0)
+ terminal-table (>= 1.4.5, < 2.0.0)
+ tty-screen (>= 0.6.3, < 1.0.0)
+ tty-spinner (>= 0.8.0, < 1.0.0)
+ word_wrap (~> 1.0.0)
+ xcodeproj (>= 1.13.0, < 2.0.0)
+ xcpretty (~> 0.3.0)
+ xcpretty-travis-formatter (>= 0.0.3)
+ gh_inspector (1.1.3)
+ google-apis-androidpublisher_v3 (0.11.0)
+ google-apis-core (>= 0.4, < 2.a)
+ google-apis-core (0.4.1)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (>= 0.16.2, < 2.a)
+ httpclient (>= 2.8.1, < 3.a)
+ mini_mime (~> 1.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.a)
+ rexml
+ webrick
+ google-apis-iamcredentials_v1 (0.7.0)
+ google-apis-core (>= 0.4, < 2.a)
+ google-apis-playcustomapp_v1 (0.5.0)
+ google-apis-core (>= 0.4, < 2.a)
+ google-apis-storage_v1 (0.6.0)
+ google-apis-core (>= 0.4, < 2.a)
+ google-cloud-core (1.6.0)
+ google-cloud-env (~> 1.0)
+ google-cloud-errors (~> 1.0)
+ google-cloud-env (1.5.0)
+ faraday (>= 0.17.3, < 2.0)
+ google-cloud-errors (1.1.0)
+ google-cloud-storage (1.34.1)
+ addressable (~> 2.5)
+ digest-crc (~> 0.4)
+ google-apis-iamcredentials_v1 (~> 0.1)
+ google-apis-storage_v1 (~> 0.1)
+ google-cloud-core (~> 1.6)
+ googleauth (>= 0.16.2, < 2.a)
+ mini_mime (~> 1.0)
+ googleauth (0.17.1)
+ faraday (>= 0.17.3, < 2.0)
+ jwt (>= 1.4, < 3.0)
+ memoist (~> 0.16)
+ multi_json (~> 1.11)
+ os (>= 0.9, < 2.0)
+ signet (~> 0.15)
+ highline (2.0.3)
+ http-cookie (1.0.4)
+ domain_name (~> 0.5)
+ httpclient (2.8.3)
+ jmespath (1.4.0)
+ json (2.5.1)
+ jwt (2.2.3)
+ memoist (0.16.2)
+ mini_magick (4.11.0)
+ mini_mime (1.1.1)
+ multi_json (1.15.0)
+ multipart-post (2.0.0)
+ nanaimo (0.3.0)
+ naturally (2.2.1)
+ optparse (0.1.1)
+ os (1.1.1)
+ plist (3.6.0)
+ public_suffix (4.0.6)
+ rake (13.0.6)
+ representable (3.1.1)
+ declarative (< 0.1.0)
+ trailblazer-option (>= 0.1.1, < 0.2.0)
+ uber (< 0.2.0)
+ retriable (3.1.2)
+ rexml (3.2.5)
+ rouge (2.0.7)
+ ruby2_keywords (0.0.5)
+ rubyzip (2.3.2)
+ security (0.1.3)
+ signet (0.16.0)
+ addressable (~> 2.8)
+ faraday (>= 0.17.3, < 2.0)
+ jwt (>= 1.5, < 3.0)
+ multi_json (~> 1.10)
+ simctl (1.6.8)
+ CFPropertyList
+ naturally
+ terminal-notifier (2.0.0)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
+ trailblazer-option (0.1.1)
+ tty-cursor (0.7.1)
+ tty-screen (0.8.1)
+ tty-spinner (0.9.3)
+ tty-cursor (~> 0.7)
+ uber (0.1.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.8)
+ unicode-display_width (1.8.0)
+ webrick (1.7.0)
+ word_wrap (1.0.0)
+ xcodeproj (1.21.0)
+ CFPropertyList (>= 2.3.3, < 4.0)
+ atomos (~> 0.1.3)
+ claide (>= 1.0.2, < 2.0)
+ colored2 (~> 3.1)
+ nanaimo (~> 0.3.0)
+ rexml (~> 3.2.4)
+ xcpretty (0.3.0)
+ rouge (~> 2.0.7)
+ xcpretty-travis-formatter (1.0.1)
+ xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+ x86_64-linux
+
+DEPENDENCIES
+ fastlane
+
+BUNDLED WITH
+ 2.2.27
From 9ded4e57ed92999c6c5be74fbb5bd5cd0ff60a49 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 01:09:51 +0200
Subject: [PATCH 04/24] first test of automatic deployment to google play with
fastlane
---
.gitlab-ci.yml | 33 +++++++++++++--------------------
fastlane/Appfile | 5 +++++
fastlane/Fastfile | 23 +++++++++++++++++++++++
3 files changed, 41 insertions(+), 20 deletions(-)
create mode 100644 fastlane/Appfile
create mode 100644 fastlane/Fastfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c56709..6dbd34b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,7 +89,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/org.fabinfra.fabaccess.aab # saving apk to copy to deploy folder
+ - Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess.aab # saving apk to copy to deploy folder
- Borepin/Borepin.Android/bin/Release/
# - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests
@@ -145,22 +145,15 @@ build_GTK:
# 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
+deploy_android:
+ stage: deploy
+ image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
+ only:
+ - tags
+ before_script:
+ - 'echo $play_store_credentials > play-store-credentials.json'
+ script:
+ - 'bundle install'
+ - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track internal'
+ dependencies:
+ - build_Android
diff --git a/fastlane/Appfile b/fastlane/Appfile
new file mode 100644
index 0000000..23b44c2
--- /dev/null
+++ b/fastlane/Appfile
@@ -0,0 +1,5 @@
+json_key_file("./play-store-credentials.json")
+package_name("org.fab_infra.fabaccess")
+
+# For more information about the Appfile, see:
+# https://docs.fastlane.tools/advanced/#appfile
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
new file mode 100644
index 0000000..0f39ea6
--- /dev/null
+++ b/fastlane/Fastfile
@@ -0,0 +1,23 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+# https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+# https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:ios)
+
+platform :ios do
+ desc "Description of what the lane does"
+ lane :custom_lane do
+ # add actions here: https://docs.fastlane.tools/actions
+ end
+end
From e4ec7f2570199526176a7f6d2b4bf2e01a44c08c Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 01:18:13 +0200
Subject: [PATCH 05/24] edited ci cfg
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6dbd34b..330427a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,6 @@ variables:
stages:
- build
- - test
- deploy
build_base:
@@ -89,7 +88,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/org.fab_infra.fabaccess.aab # saving apk to copy to deploy folder
+ - Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab # saving apk to copy to deploy folder
- Borepin/Borepin.Android/bin/Release/
# - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests
From 84c82b2e0d62ff1ebfc32b9c1c70e2c4b43bc972 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Thu, 16 Sep 2021 23:21:09 +0000
Subject: [PATCH 06/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 330427a..d07101c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,8 +147,8 @@ build_GTK:
deploy_android:
stage: deploy
image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
- only:
- - tags
+ tags:
+ - docker
before_script:
- 'echo $play_store_credentials > play-store-credentials.json'
script:
From ec62b5a11c857b00126dcfb334aa35b662aec80a Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Thu, 16 Sep 2021 23:22:24 +0000
Subject: [PATCH 07/24] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d07101c..27bc67c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,6 +145,8 @@ build_GTK:
# - build_job
deploy_android:
+ needs:
+ - build_android
stage: deploy
image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
tags:
From 4a1345b9dd381149a7891f6f685b440bf430ea4a Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Thu, 16 Sep 2021 23:24:16 +0000
Subject: [PATCH 08/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 27bc67c..9004cc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,9 +144,9 @@ build_GTK:
# dependencies:
# - build_job
-deploy_android:
+deploy_Android:
needs:
- - build_android
+ - build_Android
stage: deploy
image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
tags:
From 114b4434bd924f6a0f8223080c6e9dcb37761291 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Thu, 16 Sep 2021 23:54:10 +0000
Subject: [PATCH 09/24] Update .gitlab-ci.yml Deleted
.gitlab/.gitlab-webide.yml
---
.gitlab-ci.yml | 2 ++
.gitlab/.gitlab-webide.yml | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
delete mode 100644 .gitlab/.gitlab-webide.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9004cc0..1acb7a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,5 +156,7 @@ deploy_Android:
script:
- 'bundle install'
- 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track internal'
+ after_script:
+ - 'rm play-store-credentials.json'
dependencies:
- build_Android
diff --git a/.gitlab/.gitlab-webide.yml b/.gitlab/.gitlab-webide.yml
deleted file mode 100644
index bf6f2c0..0000000
--- a/.gitlab/.gitlab-webide.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-terminal:
- # This can be any image that has the necessary runtime environment for your project.
- image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
- script: sleep 60
From e6899ac145a06897457ed21b7f0838fe9086f1c3 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 00:46:10 +0000
Subject: [PATCH 10/24] Update .gitlab-ci.yml,
Borepin/Borepin.Android/Borepin.Android.csproj files
---
.gitlab-ci.yml | 2 ++
Borepin/Borepin.Android/Borepin.Android.csproj | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1acb7a4..7ae6119 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,8 @@ variables:
DOTNET_PATH: 'C:\Program Files\dotnet\dotnet.exe'
MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe'
NUNIT_PATH: 'C:\ProgramData\chocolatey\bin\nunit3-console.exe'
+ LC_ALL: 'en_US.UTF-8'
+ LANG: 'en_US.UTF-8'
stages:
- build
diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj
index 9a7f116..b6fb6d8 100644
--- a/Borepin/Borepin.Android/Borepin.Android.csproj
+++ b/Borepin/Borepin.Android/Borepin.Android.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -178,4 +178,9 @@
<UserProperties TriggeredFromHotReload="False" />
</VisualStudio>
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
+
+<Target Name="BeforeBuild" Condition=" '$(CI)' == 'true' ">
+ <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionCode" Value="$(CI_COMMIT_SHORT_SHA)" />
+ <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionName" Value="2.0.$(CI_COMMIT_SHORT_SHA)" />
+</Target>
From 88db0440721df2643a04199dcf1054c23518c344 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 00:51:33 +0000
Subject: [PATCH 11/24] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ae6119..ffb4a06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,8 +32,6 @@ variables:
DOTNET_PATH: 'C:\Program Files\dotnet\dotnet.exe'
MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe'
NUNIT_PATH: 'C:\ProgramData\chocolatey\bin\nunit3-console.exe'
- LC_ALL: 'en_US.UTF-8'
- LANG: 'en_US.UTF-8'
stages:
- build
@@ -147,6 +145,9 @@ build_GTK:
# - build_job
deploy_Android:
+ variables:
+ LC_ALL: 'en_US.UTF-8'
+ LANG: 'en_US.UTF-8'
needs:
- build_Android
stage: deploy
From c26c34950fe5643baca0f3405f40adb9739dec6a Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 00:57:29 +0000
Subject: [PATCH 12/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 ffb4a06..39b6206 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ build_base:
# - 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' # build the project
+ - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Restore;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:
From addcb6672a946b09b6b287e7bb76f7d4ad76ce39 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 00:58:48 +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 39b6206..d6559d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ build_base:
# - 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:Restore;Borepin' # build the project
+ - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Restore /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:
From 4ac3bb3c98e9c8fc96e47c266a401b95dbc3501b Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 01:00:34 +0000
Subject: [PATCH 14/24] Update Borepin/Borepin.Android/Borepin.Android.csproj
---
Borepin/Borepin.Android/Borepin.Android.csproj | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj
index b6fb6d8..bcd825d 100644
--- a/Borepin/Borepin.Android/Borepin.Android.csproj
+++ b/Borepin/Borepin.Android/Borepin.Android.csproj
@@ -178,9 +178,8 @@
<UserProperties TriggeredFromHotReload="False" />
</VisualStudio>
</ProjectExtensions>
-</Project>
-
-<Target Name="BeforeBuild" Condition=" '$(CI)' == 'true' ">
+ <Target Name="BeforeBuild" Condition=" '$(CI)' == 'true' ">
<XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionCode" Value="$(CI_COMMIT_SHORT_SHA)" />
<XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionName" Value="2.0.$(CI_COMMIT_SHORT_SHA)" />
</Target>
+</Project>
From 292bb3a638284315f16a6e9e82a8566fc066aefa Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 01:10:17 +0000
Subject: [PATCH 15/24] Update Borepin/Borepin.Android/Borepin.Android.csproj
---
Borepin/Borepin.Android/Borepin.Android.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj
index bcd825d..8fb988d 100644
--- a/Borepin/Borepin.Android/Borepin.Android.csproj
+++ b/Borepin/Borepin.Android/Borepin.Android.csproj
@@ -180,6 +180,6 @@
</ProjectExtensions>
<Target Name="BeforeBuild" Condition=" '$(CI)' == 'true' ">
<XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionCode" Value="$(CI_COMMIT_SHORT_SHA)" />
- <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionName" Value="2.0.$(CI_COMMIT_SHORT_SHA)" />
+ <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionName" Value="0.0.$(CI_COMMIT_SHORT_SHA)" />
</Target>
</Project>
From 6e9227e75924b541d0370a565b78e338116e95b8 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 01:13:15 +0000
Subject: [PATCH 16/24] Update Borepin/Borepin.Android/Borepin.Android.csproj
---
Borepin/Borepin.Android/Borepin.Android.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj
index 8fb988d..de770ea 100644
--- a/Borepin/Borepin.Android/Borepin.Android.csproj
+++ b/Borepin/Borepin.Android/Borepin.Android.csproj
@@ -180,6 +180,6 @@
</ProjectExtensions>
<Target Name="BeforeBuild" Condition=" '$(CI)' == 'true' ">
<XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionCode" Value="$(CI_COMMIT_SHORT_SHA)" />
- <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionName" Value="0.0.$(CI_COMMIT_SHORT_SHA)" />
+ <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionName" Value="1.0.$(CI_COMMIT_SHORT_SHA)" />
</Target>
</Project>
From a76ff8e2584d4a4589aaefae8c9b200713a58a07 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 01:31:38 +0000
Subject: [PATCH 17/24] Update Borepin/Borepin.Android/Borepin.Android.csproj
---
Borepin/Borepin.Android/Borepin.Android.csproj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj
index de770ea..9da7cab 100644
--- a/Borepin/Borepin.Android/Borepin.Android.csproj
+++ b/Borepin/Borepin.Android/Borepin.Android.csproj
@@ -178,8 +178,8 @@
<UserProperties TriggeredFromHotReload="False" />
</VisualStudio>
</ProjectExtensions>
- <Target Name="BeforeBuild" Condition=" '$(CI)' == 'true' ">
- <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionCode" Value="$(CI_COMMIT_SHORT_SHA)" />
- <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionName" Value="1.0.$(CI_COMMIT_SHORT_SHA)" />
+ <Target Name="BeforeBuild" Condition=" '$(GITLAB_CI)' == 'true' ">
+ <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionCode" Value="$(CI_PIPELINE_ID)" />
+ <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="<Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' />" Query="manifest/@android:versionName" Value="0.1.0-$(CI_COMMIT_SHORT_SHA)-$(CI_PIPELINE_ID)" />
</Target>
</Project>
From 916d92dbb05be921a640bf84771f41b252171729 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 13:55:54 +0000
Subject: [PATCH 18/24] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6559d8..02393b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,6 +148,8 @@ deploy_Android:
variables:
LC_ALL: 'en_US.UTF-8'
LANG: 'en_US.UTF-8'
+ only:
+ - alpha
needs:
- build_Android
stage: deploy
From 9077eba59e63dae9b8188656e8b720a4b0fdb257 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 21:57:39 +0000
Subject: [PATCH 19/24] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02393b4..a59ae14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ 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:Restore /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:
From 06161d75b4f9fa641d4f0ac544b5803739485332 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 22:46:33 +0000
Subject: [PATCH 20/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 a59ae14..02393b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ build_iOS:
# - tags # the build process will only be started by git tag commits
script:
- 'nuget restore' # restore Nuget dependencies
- - 'msbuild /t:Restore /t:Borepin_iOS /p:Configuration=Debug /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:
From e303a67c2b948f52f813f661d14be3fc1bae40c6 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 23:07:20 +0000
Subject: [PATCH 21/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 02393b4..b07c171 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,6 +102,7 @@ build_iOS:
# - tags # the build process will only be started by git tag commits
script:
- 'nuget restore' # restore Nuget dependencies
+ - 'dotnet restore'
- '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
From 3102b3596e24ed45c40c24e2013e1a835a5dd49e Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 23:21:33 +0000
Subject: [PATCH 22/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 b07c171..dba1b90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ build_iOS:
# - tags # the build process will only be started by git tag commits
script:
- 'nuget restore' # restore Nuget dependencies
- - 'dotnet restore'
+ - 'nuget restore'
- '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
From d6c931db11b69d78a64e1475858cbfe65c1a1f2f Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Sat, 18 Sep 2021 22:51:35 +0000
Subject: [PATCH 23/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 dba1b90..c424a05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ build_iOS:
# - tags # the build process will only be started by git tag commits
script:
- 'nuget restore' # restore Nuget dependencies
- - 'nuget restore'
+ - 'msbuild /t:Restore'
- '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
From 154cc138b3425d879cfeb35ae6d17ab90115014d Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Sun, 19 Sep 2021 20:30:14 +0000
Subject: [PATCH 24/24] added suto deloy to testflight
---
.gitlab-ci.yml | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c424a05..2b77cda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,7 +108,7 @@ build_iOS:
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/Debug/
# - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests
build_GTK:
@@ -166,3 +166,24 @@ deploy_Android:
- 'rm play-store-credentials.json'
dependencies:
- build_Android
+
+deploy_iOS:
+ variables:
+ LC_ALL: 'en_US.UTF-8'
+ LANG: 'en_US.UTF-8'
+ only:
+ - alpha
+ needs:
+ - build_iOS
+ stage: deploy
+ tags:
+ - macos
+ before_script:
+ - 'echo $app_store_credentials > app-store-credentials.json'
+ script:
+ - 'bundle install'
+ - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json'
+ after_script:
+ - 'rm app-store-credentials.json'
+ dependencies:
+ - build_iOS