From 266e6932a8a018e8c08625fee0b59862a45208ea Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Tue, 28 Sep 2021 01:05:01 +0200
Subject: [PATCH 1/5] update fastlane on pipeline run

---
 .gitlab-ci.yml    |  1 +
 fastlane/Fastfile | 23 -----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95dd58e..2bcf48e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -206,6 +206,7 @@ deploy_iOS:
     - 'export PATH="/usr/local/opt/ruby/bin:$PATH"'
   script:
     - 'bundle install'
+    - 'bundle update fastlane'
     - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json --ipa Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa'
   after_script:
     - 'rm app-store-credentials.json'
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0f39ea6..e69de29 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1,23 +0,0 @@
-# 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 36084c4f76ca61c1d1f2b34768033ee03b4de0af Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Tue, 28 Sep 2021 01:24:56 +0200
Subject: [PATCH 2/5] removed excess paths from artifacts

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bcf48e..7f818d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,7 +89,7 @@ build_Android:
     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-Signed.aab  # saving apk to copy to deploy folder
-      - Borepin/Borepin.Android/bin/Release/
+      #- Borepin/Borepin.Android/bin/Release/
       # - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
 
 build_iOS:
@@ -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.iOS.ipa
-      - Borepin/Borepin.iOS/bin/iPhone/Debug/
+      #- Borepin/Borepin.iOS/bin/iPhone/Debug/
       #  - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
 
 build_GTK:

From dc8c66616fc87cdf19efec2f843fa242e81581e3 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Tue, 28 Sep 2021 02:35:49 +0200
Subject: [PATCH 3/5] added cd for beta

---
 .gitlab-ci.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f818d2..c6ce783 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -189,13 +189,12 @@ deploy_Android_beta:
   dependencies:
     - build_Android
 
-deploy_iOS:
+deploy_iOS_alpha:
   variables:
     LC_ALL: 'en_US.UTF-8'
     LANG: 'en_US.UTF-8'
   only:
     - alpha
-    - feature/fastlane
   needs:
     - build_iOS
   stage: deploy
@@ -212,3 +211,27 @@ deploy_iOS:
     - 'rm app-store-credentials.json'
   dependencies:
     - build_iOS
+
+deploy_iOS_beta:
+  variables:
+    LC_ALL: 'en_US.UTF-8'
+    LANG: 'en_US.UTF-8'
+  only:
+    - beta
+    - feature/fastlane
+  needs:
+    - build_iOS
+  stage: deploy
+  tags:
+    - macos
+  before_script:
+    - 'echo $app_store_credentials > app-store-credentials.json'
+    - 'export PATH="/usr/local/opt/ruby/bin:$PATH"'
+  script:
+    - 'bundle install'
+    - 'bundle update fastlane'
+    - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json --ipa Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa --distribute_external true --groups Beta'
+  after_script:
+    - 'rm app-store-credentials.json'
+  dependencies:
+    - build_iOS

From 98d65529cc6ff2f7bd1a860a71f3a1013d765966 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Tue, 28 Sep 2021 02:52:19 +0200
Subject: [PATCH 4/5] set ios beta changelog to latest commit message

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6ce783..2e84dc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -230,7 +230,7 @@ deploy_iOS_beta:
   script:
     - 'bundle install'
     - 'bundle update fastlane'
-    - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json --ipa Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa --distribute_external true --groups Beta'
+    - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json --ipa Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa --distribute_external true --groups Beta --changelog "$CI_COMMIT_MESSAGE"'
   after_script:
     - 'rm app-store-credentials.json'
   dependencies:

From 185626fbb25cd169d5b570edda589034d2f628c7 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Tue, 28 Sep 2021 03:30:58 +0200
Subject: [PATCH 5/5] removed feature branch from deployment triggers

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e84dc6..62915ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -218,7 +218,6 @@ deploy_iOS_beta:
     LANG: 'en_US.UTF-8'
   only:
     - beta
-    - feature/fastlane
   needs:
     - build_iOS
   stage: deploy