Fastlane fixes

amnezia-vpn · May 9, 2023 · 150bc50 · 150bc50
1 parent 1e35053
commit 150bc50
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 39 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -198,7 +198,7 @@ jobs:
 
     - name: 'Build and upload iOS binary'
       working-directory: ./client
-      run: bundle exec fastlane build_and_upload_to_testflight
+      run: bundle exec fastlane build_release
       env:
         APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
         APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}

diff --git a/client/fastlane/Appfile b/client/fastlane/Appfile
@@ -1,5 +1,5 @@
 #app_identifier(["org.amnezia.AmneziaVPN", "org.amnezia.AmneziaVPN.network-extension"]) # The bundle identifier of your app
-app_identifier(["org.amnezia.AmneziaVPN"])
+app_identifier("org.amnezia.AmneziaVPN")
 apple_id("admin@amnezia.org") # TODO: replace with apple id 
 itc_team_id("122591025") #  App Store Connect Team ID
 team_id("X7UJ388FXK") # Developer Portal Team ID
diff --git a/client/fastlane/Fastfile b/client/fastlane/Fastfile
@@ -18,7 +18,7 @@ lane :load_api_key do
     key_id: ENV['APPSTORE_CONNECT_KEY_ID'],
     issuer_id: ENV['APPSTORE_CONNECT_ISSUER_ID'],
     key_content: ENV['APPSTORE_CONNECT_PRIVATE_KEY'],
-    is_key_content_base64: true,
+    is_key_content_base64: false,
     in_house: false
   )
 end
@@ -90,6 +90,7 @@ lane :build_release do |options|
   export_method = "app-store"
 
   update_code_signing_settings(
+    path: File.expand_path("../build-ios/AmneziaVPN.xcodeproj/"),
     use_automatic_signing: false,
     targets: [project_name],
     code_sign_identity: "Apple Distribution", # TODO: replace with proper one

diff --git a/client/fastlane/README.md b/client/fastlane/README.md
@@ -13,71 +13,53 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 # Available Actions
 
-### beta
+### load_api_key
 
 ```sh
-[bundle exec] fastlane beta
+[bundle exec] fastlane load_api_key
 ```
 
+Load AppStore Connect APIKey for using in lanes
 
-
-### incrementVersion
-
-```sh
-[bundle exec] fastlane incrementVersion
-```
-
-
-
-### addToTestFlight
-
-```sh
-[bundle exec] fastlane addToTestFlight
-```
-
-Update Certificates, Run All tests, Build app
-
-Add tag to git, send to Testflight, slack notification
-
-### certificates
+### fetch_and_increment_build_version
 
 ```sh
-[bundle exec] fastlane certificates
+[bundle exec] fastlane fetch_and_increment_build_version
 ```
 
+Increase build number based on most recent TestFlight existing one
 
-
-### adhoc_certificates
+### setup_signing_identities
 
 ```sh
-[bundle exec] fastlane adhoc_certificates
+[bundle exec] fastlane setup_signing_identities
 ```
 
+Set up signing identities: install certificates in keychain and download provisioning profiles
 
-
-### createAPNS
+### build_release
 
 ```sh
-[bundle exec] fastlane createAPNS
+[bundle exec] fastlane build_release
 ```
 
+build app for release (TestFlight)
 
-
-### firebase_test
+### upload_release_to_testflight
 
 ```sh
-[bundle exec] fastlane firebase_test
+[bundle exec] fastlane upload_release_to_testflight
 ```
 
-Distribute app via Firebase for testers
+Upload to TestFlight via AppStore Connect
 
-### distribute_firebase
+### build_and_upload_to_testflight
 
 ```sh
-[bundle exec] fastlane distribute_firebase
+[bundle exec] fastlane build_and_upload_to_testflight
 ```
 
-Distribute app via Firebase for testers
+Build release and upload to TestFlight
 
 ----