From 4bb42f0bb263140ba806a1f00435ffa53483eb30 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Thu, 27 Mar 2025 12:21:53 -0600 Subject: [PATCH 1/6] Run a production deploy on push to branch --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a1383114e7a4..6046385e97e3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,10 +2,10 @@ name: Deploy code to staging or production on: push: - branches: [staging, production] + branches: [staging, production, andrew-ios-prod] env: - SHOULD_DEPLOY_PRODUCTION: ${{ github.ref == 'refs/heads/production' }} + SHOULD_DEPLOY_PRODUCTION: ${{ github.ref == 'refs/heads/andrew-ios-prod' }} IS_APP_REPO: ${{ github.repository == 'Expensify/App' }} concurrency: From e10d0775902beee0cb282a145f8ab775e1acb17f Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Thu, 27 Mar 2025 12:36:50 -0600 Subject: [PATCH 2/6] Fix key path to fix iOS production deploys --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1919a1c782c3..e6c79a871422 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -567,7 +567,7 @@ platform :ios do lane :complete_hybrid_rollout do # Local path is different when using Spaceship::ConnectAPI::Token.from_json_file, # the working directory is: /Users/runner/work/App/App/Mobile-Expensify/react-native/fastlane - api_token = Spaceship::ConnectAPI::Token.from_json_file("../ios/ios-fastlane-json-key.json") + api_token = Spaceship::ConnectAPI::Token.from_json_file("./ios-fastlane-json-key.json") Spaceship::ConnectAPI.token = api_token app = Spaceship::ConnectAPI::App.find(ENV["APPLE_ID"]) From e1ba2b4b4bc05713d180c6a8dde4198bbad99268 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Thu, 27 Mar 2025 13:08:59 -0600 Subject: [PATCH 3/6] Try different path --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e6c79a871422..d22c6748434a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -567,7 +567,7 @@ platform :ios do lane :complete_hybrid_rollout do # Local path is different when using Spaceship::ConnectAPI::Token.from_json_file, # the working directory is: /Users/runner/work/App/App/Mobile-Expensify/react-native/fastlane - api_token = Spaceship::ConnectAPI::Token.from_json_file("./ios-fastlane-json-key.json") + api_token = Spaceship::ConnectAPI::Token.from_json_file("../../ios/ios-fastlane-json-key.json") Spaceship::ConnectAPI.token = api_token app = Spaceship::ConnectAPI::App.find(ENV["APPLE_ID"]) From 4a66f1fa82fa5bfae240dd770bec965fee5311f2 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Thu, 27 Mar 2025 14:00:38 -0600 Subject: [PATCH 4/6] Try another path --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d22c6748434a..80fde8602bc8 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -567,7 +567,7 @@ platform :ios do lane :complete_hybrid_rollout do # Local path is different when using Spaceship::ConnectAPI::Token.from_json_file, # the working directory is: /Users/runner/work/App/App/Mobile-Expensify/react-native/fastlane - api_token = Spaceship::ConnectAPI::Token.from_json_file("../../ios/ios-fastlane-json-key.json") + api_token = Spaceship::ConnectAPI::Token.from_json_file("../../../ios-fastlane-json-key.json") Spaceship::ConnectAPI.token = api_token app = Spaceship::ConnectAPI::App.find(ENV["APPLE_ID"]) From 890eab9423f0e1716a0dc6248e09852d3e9b3c76 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Thu, 27 Mar 2025 14:26:05 -0600 Subject: [PATCH 5/6] Try another path --- fastlane/Fastfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 80fde8602bc8..7dfcec4c7c30 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -566,8 +566,8 @@ platform :ios do desc "Submit HybridApp to 100% rollout on App Store" lane :complete_hybrid_rollout do # Local path is different when using Spaceship::ConnectAPI::Token.from_json_file, - # the working directory is: /Users/runner/work/App/App/Mobile-Expensify/react-native/fastlane - api_token = Spaceship::ConnectAPI::Token.from_json_file("../../../ios-fastlane-json-key.json") + # the working directory is: /Users/runner/work/App/App/fastlane + api_token = Spaceship::ConnectAPI::Token.from_json_file("../ios-fastlane-json-key.json") Spaceship::ConnectAPI.token = api_token app = Spaceship::ConnectAPI::App.find(ENV["APPLE_ID"]) From 29963b363c0ecb5f98800ac187b15e3f328c027b Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Thu, 27 Mar 2025 14:46:33 -0600 Subject: [PATCH 6/6] Remove some debug testing --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6046385e97e3..a1383114e7a4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,10 +2,10 @@ name: Deploy code to staging or production on: push: - branches: [staging, production, andrew-ios-prod] + branches: [staging, production] env: - SHOULD_DEPLOY_PRODUCTION: ${{ github.ref == 'refs/heads/andrew-ios-prod' }} + SHOULD_DEPLOY_PRODUCTION: ${{ github.ref == 'refs/heads/production' }} IS_APP_REPO: ${{ github.repository == 'Expensify/App' }} concurrency: