Merge branch 'beta' into 'New_API'

Beta

See merge request fabinfra/fabaccess/borepin!23

.gitlab-ci.yml

@@ -145,7 +145,7 @@ build_GTK:
 #   dependencies:
 #     - build_job
 
-deploy_Android:
+deploy_Android_alpha:
   variables:
     LC_ALL: 'en_US.UTF-8'
     LANG: 'en_US.UTF-8'
@@ -167,12 +167,35 @@ deploy_Android:
   dependencies:
     - build_Android
 
+deploy_Android_beta:
+  variables:
+    LC_ALL: 'en_US.UTF-8'
+    LANG: 'en_US.UTF-8'
+  only:
+    - beta
+  needs:
+    - build_Android
+  stage: deploy
+  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
+  tags:
+    - docker
+  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 beta'
+  after_script:
+    - 'rm play-store-credentials.json'
+  dependencies:
+    - build_Android
+
 deploy_iOS:
   variables:
     LC_ALL: 'en_US.UTF-8'
     LANG: 'en_US.UTF-8'
   only:
     - alpha
+    - feature/fastlane
   needs:
     - build_iOS
   stage: deploy
@@ -180,9 +203,10 @@ deploy_iOS:
     - macos
   before_script:
     - 'echo $app_store_credentials > app-store-credentials.json'
+    - 'export PATH="/usr/local/opt/ruby/bin:$PATH"'
   script:
     - 'bundle install'
-    - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json'
+    - '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'
   dependencies:

Borepin/Borepin.Android/Borepin.Android.csproj

@@ -185,6 +185,6 @@
   </ProjectExtensions>
   <Target Name="BeforeBuild" Condition=" '$(GITLAB_CI)' == 'true' ">
     <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="&lt;Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' /&gt;" Query="manifest/@android:versionCode" Value="$(CI_PIPELINE_ID)" />
-    <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="&lt;Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' /&gt;" Query="manifest/@android:versionName" Value="0.1.0-$(CI_COMMIT_SHORT_SHA)-$(CI_PIPELINE_ID)" />
+    <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="&lt;Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' /&gt;" Query="manifest/@android:versionName" Value="$(CI_COMMIT_SHORT_SHA)-$(CI_PIPELINE_ID)" />
 </Target>
 </Project>