From fffe3ef1593004fb8ca8e496dd8bf37a92126822 Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Tue, 29 Jul 2025 07:09:08 +0300 Subject: [PATCH] Automated cherry pick of #9037 (#9038) * attempt to fix base timeout error on fastlane for release build (#9037) (cherry picked from commit d00407c3309fe65578ddd46f97b20654910c1645) * fix test on GlobalScheduledPostList --------- Co-authored-by: sabril <5334504+saturninoabril@users.noreply.github.com> --- .../global_scheduled_post_list/index.test.tsx | 11 ++++++++++- fastlane/.env.ios.release | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/screens/global_drafts/components/global_scheduled_post_list/index.test.tsx b/app/screens/global_drafts/components/global_scheduled_post_list/index.test.tsx index 3339db626..fd389d012 100644 --- a/app/screens/global_drafts/components/global_scheduled_post_list/index.test.tsx +++ b/app/screens/global_drafts/components/global_scheduled_post_list/index.test.tsx @@ -23,6 +23,13 @@ jest.mock('./global_scheduled_post_list', () => ({ default: jest.fn(), })); +jest.mock('react-native', () => ({ + ...jest.requireActual('react-native'), + DeviceEventEmitter: { + emit: jest.fn(), + }, +})); + jest.mocked(GlobalScheduledPostList).mockImplementation((props) => React.createElement('GlobalScheduledPostList', {...props, testID: 'global-scheduled-post-list'})); describe('GlobalScheduledPostList', () => { @@ -114,7 +121,9 @@ describe('GlobalScheduledPostList', () => { const globalScheduledPostList = getByTestId('global-scheduled-post-list'); expect(globalScheduledPostList.props.tutorialWatched).toBe(false); - await storeGlobal(Tutorial.SCHEDULED_POSTS_LIST, 'true', false); + await act(async () => { + await storeGlobal(Tutorial.SCHEDULED_POSTS_LIST, 'true', false); + }); await waitFor(() => { const updatedGlobalScheduledPostList = getByTestId('global-scheduled-post-list'); diff --git a/fastlane/.env.ios.release b/fastlane/.env.ios.release index 730ef82f8..d4e17f785 100644 --- a/fastlane/.env.ios.release +++ b/fastlane/.env.ios.release @@ -7,6 +7,8 @@ AWS_REGION=us-east-1 BUILD_FOR_RELEASE=true COLLECT_NETWORK_METRICS=false EXTENSION_APP_IDENTIFIER=com.mattermost.rn.MattermostShare +FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT=120 +FASTLANE_XCODEBUILD_SETTINGS_RETRIES=6 IOS_APP_GROUP=group.com.mattermost IOS_BUILD_EXPORT_METHOD=app-store IOS_ICLOUD_CONTAINER=iCloud.com.mattermost.rn