From 81c03c1c69f9bf9cc8ca1496e34bc0624e266cc3 Mon Sep 17 00:00:00 2001
From: Artur Guseinov <arthur.guseinov@gmail.com>
Date: Mon, 13 Feb 2023 13:50:40 +0530
Subject: [PATCH] Cert fix + project_id

---
 .github/workflows/release.yml | 2 +-
 Makefile                      | 8 ++++----
 fastlane/Fastfile             | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5246d94d9..c30113723 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,4 +39,4 @@ jobs:
         APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
         APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
       run: |
-        make release_all APPLE_ID=${{ secrets.APPLE_ID }} TOKEN=$(echo -n $GH_USER:$GH_TOKEN | base64)
+        make release_all APPLE_ID=${{ secrets.APPLE_ID }} TOKEN=$(echo -n $GH_USER:$GH_TOKEN | base64) PROJECT_ID=${{ secrets.RELEASE_PROJECT_ID }}
diff --git a/Makefile b/Makefile
index 806b4f5bf..fa43c4abf 100755
--- a/Makefile
+++ b/Makefile
@@ -35,11 +35,11 @@ resolve_packages:
 	fastlane resolve scheme:WalletApp
 
 release_wallet:
-	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) --env WalletApp
+	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) --env WalletApp
 
 release_showcase:
-	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) --env Showcase
+	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) --env Showcase
 
 release_all: 
-	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) --env WalletApp
-	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) --env Showcase
+	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) --env WalletApp
+	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) --env Showcase
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index aac915608..b32acd249 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -65,7 +65,8 @@ platform :ios do
       app_identifier: ENV["MATCH_IDENTIFIERS"],
       git_url: "https://github.com/WalletConnect/match-swift.git",
       git_basic_authorization: options[:token],
-      api_key: api_key
+      api_key: api_key,
+      include_all_certificates: true
     )
     number = latest_testflight_build_number(
       app_identifier: ENV["APP_IDENTIFIER"],
@@ -80,6 +81,7 @@ platform :ios do
       project: "Example/ExampleApp.xcodeproj",
       scheme: ENV["SCHEME"],
       export_method: "app-store",
+      xcargs: "RELAY_HOST='#{options[:relay_host]}' PROJECT_ID='#{options[:project_id]}'"
     )
     upload_to_testflight(
       apple_id: ENV["APPLE_ID"],