diff --git a/.github/workflows/mobile-deploy.yml b/.github/workflows/mobile-deploy.yml index 5496dda3c..62480166a 100644 --- a/.github/workflows/mobile-deploy.yml +++ b/.github/workflows/mobile-deploy.yml @@ -481,6 +481,10 @@ jobs: - name: Build and upload to App Store Connect/TestFlight if: inputs.platform != 'android' && !env.ACT env: + ENABLE_DEBUG_LOGS: ${{ secrets.ENABLE_DEBUG_LOGS }} + GRAFANA_LOKI_PASSWORD: ${{ secrets.GRAFANA_LOKI_PASSWORD }} + GRAFANA_LOKI_URL: ${{ secrets.GRAFANA_LOKI_URL }} + GRAFANA_LOKI_USERNAME: ${{ secrets.GRAFANA_LOKI_USERNAME }} IOS_APP_IDENTIFIER: ${{ secrets.IOS_APP_IDENTIFIER }} IOS_CONNECT_API_KEY_BASE64: ${{ secrets.IOS_CONNECT_API_KEY_BASE64 }} IOS_CONNECT_API_KEY_PATH: ${{ env.APP_PATH }}${{ env.IOS_CONNECT_API_KEY_PATH }} @@ -493,14 +497,13 @@ jobs: IOS_PROV_PROFILE_NAME: ${{ secrets.IOS_PROV_PROFILE_NAME }} IOS_PROV_PROFILE_PATH: ${{ env.IOS_PROV_PROFILE_PATH }} IOS_SIGNING_CERTIFICATE: ${{ secrets.IOS_SIGNING_CERTIFICATE }} - IOS_TESTFLIGHT_GROUPS: ${{ secrets.IOS_TESTFLIGHT_GROUPS }} IOS_TEAM_ID: ${{ secrets.IOS_TEAM_ID }} IOS_TEAM_NAME: ${{ secrets.IOS_TEAM_NAME }} + IOS_TESTFLIGHT_GROUPS: ${{ secrets.IOS_TESTFLIGHT_GROUPS }} NODE_OPTIONS: "--max-old-space-size=8192" + SEGMENT_KEY: ${{ secrets.SEGMENT_KEY }} SELFXYZ_INTERNAL_REPO_PAT: ${{ secrets.SELFXYZ_INTERNAL_REPO_PAT }} - SLACK_API_TOKEN: ${{ secrets.SLACK_API_TOKEN }} - SLACK_CHANNEL_ID: ${{ secrets.SLACK_CHANNEL_ID }} - SLACK_ANNOUNCE_CHANNEL_NAME: ${{ secrets.SLACK_ANNOUNCE_CHANNEL_NAME }} + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} timeout-minutes: 90 run: | cd ${{ env.APP_PATH }} @@ -887,13 +890,20 @@ jobs: - name: Build AAB with Fastlane if: inputs.platform != 'ios' env: + ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} + ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }} ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} ANDROID_KEYSTORE_PATH: ${{ env.APP_PATH }}${{ env.ANDROID_KEYSTORE_PATH }} - ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} - ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} ANDROID_PACKAGE_NAME: ${{ secrets.ANDROID_PACKAGE_NAME }} + ENABLE_DEBUG_LOGS: ${{ secrets.ENABLE_DEBUG_LOGS }} + GOOGLE_SIGNIN_ANDROID_CLIENT_ID: ${{ secrets.GOOGLE_SIGNIN_ANDROID_CLIENT_ID }} + GRAFANA_LOKI_PASSWORD: ${{ secrets.GRAFANA_LOKI_PASSWORD }} + GRAFANA_LOKI_URL: ${{ secrets.GRAFANA_LOKI_URL }} + GRAFANA_LOKI_USERNAME: ${{ secrets.GRAFANA_LOKI_USERNAME }} NODE_OPTIONS: "--max-old-space-size=6144" + SEGMENT_KEY: ${{ secrets.SEGMENT_KEY }} + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} run: | cd ${{ env.APP_PATH }} @@ -914,11 +924,7 @@ jobs: --verbose - name: Upload to Google Play Store using WIF - if: inputs.platform != 'ios' && (inputs.test_mode != true) - env: - SLACK_API_TOKEN: ${{ secrets.SLACK_API_TOKEN }} - SLACK_CHANNEL_ID: ${{ secrets.SLACK_CHANNEL_ID }} - SLACK_ANNOUNCE_CHANNEL_NAME: ${{ secrets.SLACK_ANNOUNCE_CHANNEL_NAME }} + if: inputs.platform != 'ios' && inputs.test_mode != true run: | cd ${{ env.APP_PATH }} diff --git a/app/fastlane/Fastfile b/app/fastlane/Fastfile index 37824c7ed..aac1f584b 100644 --- a/app/fastlane/Fastfile +++ b/app/fastlane/Fastfile @@ -82,21 +82,6 @@ platform :ios do if result[:should_upload] Fastlane::Helpers.update_deployment_timestamp("ios") end - - # Notify Slack about the new build - if ENV["SLACK_CHANNEL_ID"] && !test_mode - deploy_source = Fastlane::Helpers.is_ci_environment? ? "GitHub Workflow" : "Local Deploy" - Fastlane::Helpers.upload_file_to_slack( - file_path: result[:ipa_path], - channel_id: ENV["SLACK_CHANNEL_ID"], - initial_comment: "๐ŸŽ iOS v#{package_version} (Build #{result[:build_number]}) deployed to TestFlight via #{deploy_source}", - title: "#{APP_NAME}-#{package_version}-#{result[:build_number]}.ipa", - ) - elsif test_mode - UI.important("๐Ÿงช TEST MODE: Skipping Slack notification") - else - UI.important("Skipping Slack notification: SLACK_CHANNEL_ID not set.") - end end desc "Deploy iOS app with automatic version management" @@ -158,19 +143,6 @@ platform :ios do if result[:should_upload] && !test_mode Fastlane::Helpers.update_deployment_timestamp("ios") end - - # Slack notification - if ENV["SLACK_CHANNEL_ID"] && !test_mode - deploy_source = Fastlane::Helpers.is_ci_environment? ? "GitHub Actions (Auto)" : "Local Deploy" - track_emoji = deployment_track == "production" ? "๐Ÿš€" : "๐Ÿงช" - - Fastlane::Helpers.upload_file_to_slack( - file_path: result[:ipa_path], - channel_id: ENV["SLACK_CHANNEL_ID"], - initial_comment: "#{track_emoji} iOS v#{package_version} (Build #{result[:build_number]}) deployed to #{deployment_track} via #{deploy_source}", - title: "#{APP_NAME}-#{package_version}-#{result[:build_number]}.ipa", - ) - end end private_lane :prepare_ios_build do |options| @@ -477,23 +449,5 @@ platform :android do if should_upload Fastlane::Helpers.update_deployment_timestamp("android") end - - # Notify Slack about the new build - if ENV["SLACK_CHANNEL_ID"] && !test_mode - deploy_source = Fastlane::Helpers.is_ci_environment? ? "GitHub Actions (Auto)" : "Local Deploy" - deployment_track = options[:deployment_track] || options[:track] - track_emoji = deployment_track == "production" ? "๐Ÿš€" : "๐Ÿงช" - - Fastlane::Helpers.upload_file_to_slack( - file_path: android_aab_path, - channel_id: ENV["SLACK_CHANNEL_ID"], - initial_comment: "#{track_emoji} Android v#{package_version} (Build #{version_code}) deployed to #{deployment_track || target_platform} via #{deploy_source}", - title: "#{APP_NAME}-#{package_version}-#{version_code}.aab", - ) - elsif test_mode - UI.important("๐Ÿงช TEST MODE: Skipping Slack notification") - else - UI.important("Skipping Slack notification: SLACK_CHANNEL_ID not set.") - end end end diff --git a/app/fastlane/helpers.rb b/app/fastlane/helpers.rb index 43dc7d7b0..acb921eaf 100644 --- a/app/fastlane/helpers.rb +++ b/app/fastlane/helpers.rb @@ -13,7 +13,6 @@ require_relative "helpers/common" require_relative "helpers/ios" require_relative "helpers/android" -require_relative "helpers/slack" require_relative "helpers/version_manager" module Fastlane @@ -21,7 +20,6 @@ module Helpers extend Fastlane::Helpers::Common extend Fastlane::Helpers::IOS extend Fastlane::Helpers::Android - extend Fastlane::Helpers::Slack extend Fastlane::Helpers::VersionManager end end