Skip to content

Commit c563425

Browse files
authored
chore: fix testflight build issue on develop when deploy mode is true (#3367)
## 🎯 Goal <!-- Describe why we are making this change --> ## 🛠 Implementation details <!-- Provide a description of the implementation --> ## 🎨 UI Changes <!-- Add relevant screenshots --> <details> <summary>iOS</summary> <table> <thead> <tr> <td>Before</td> <td>After</td> </tr> </thead> <tbody> <tr> <td> <!--<img src="" /> --> </td> <td> <!--<img src="" /> --> </td> </tr> </tbody> </table> </details> <details> <summary>Android</summary> <table> <thead> <tr> <td>Before</td> <td>After</td> </tr> </thead> <tbody> <tr> <td> <!--<img src="" /> --> </td> <td> <!--<img src="" /> --> </td> </tr> </tbody> </table> </details> ## 🧪 Testing <!-- Explain how this change can be tested (or why it can't be tested) --> ## ☑️ Checklist - [ ] I have signed the [Stream CLA](https://docs.google.com/forms/d/e/1FAIpQLScFKsKkAJI7mhCr7K9rEIOpqIDThrWxuvxnwUq2XkHyG154vQ/viewform) (required) - [ ] PR targets the `develop` branch - [ ] Documentation is updated - [ ] New code is tested in main example apps, including all possible scenarios - [ ] SampleApp iOS and Android - [ ] Expo iOS and Android
1 parent 84ca48c commit c563425

4 files changed

Lines changed: 26 additions & 10 deletions

File tree

.github/workflows/sample-distribution.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v3
3131
- uses: maxim-lobanov/setup-xcode@v1
3232
with:
33-
xcode-version: '16.4.0' # Update as needed
33+
xcode-version: '26.0' # Update as needed
3434
- uses: ./.github/actions/ruby-cache
3535
- name: Install && Build - SDK and Sample App
3636
uses: ./.github/actions/install-and-build-sdk

examples/SampleApp/fastlane/Fastfile

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ end
3131
#######################
3232

3333
platform :ios do
34+
private_lane :latest_appstore_version_code do |options|
35+
livestates = [true, false]
36+
version_codes = []
37+
livestates.each do |livestate|
38+
vc = app_store_build_number(
39+
live: livestate,
40+
app_identifier: bundle_id
41+
)
42+
rescue StandardError
43+
puts("No app store build found for liveState: #{livestate} bundle_id: #{bundle_id}")
44+
else
45+
version_codes.append(vc)
46+
end
47+
version_codes.max
48+
end
49+
3450
lane :deploy_to_testflight_qa do |options|
3551
match_me
3652

@@ -44,11 +60,9 @@ platform :ios do
4460
xcodeproj: xcode_project
4561
)
4662

47-
current_build_number = app_store_build_number(
48-
api_key: appstore_api_key,
49-
live: false,
50-
app_identifier: bundle_id
51-
)
63+
current_build_number = latest_appstore_version_code
64+
65+
puts("Current build number: #{current_build_number}")
5266

5367
increment_build_number(
5468
build_number: current_build_number + 1,
@@ -79,8 +93,9 @@ platform :ios do
7993
api_key: appstore_api_key,
8094
groups: ['Testers'],
8195
changelog: 'Lots of amazing new features to test out!',
82-
reject_build_waiting_for_review: false,
83-
ipa: "#{build_output_directory}/#{output_ipa_name}"
96+
reject_build_waiting_for_review: true,
97+
ipa: "#{build_output_directory}/#{output_ipa_name}",
98+
skip_waiting_for_build_processing: false
8499
)
85100
else
86101
UI.message("Skipping Testflight upload! (deploy: #{deploy})")

examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@
497497
CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppDebug.entitlements;
498498
CODE_SIGN_IDENTITY = "Apple Development";
499499
CODE_SIGN_STYLE = Automatic;
500-
CURRENT_PROJECT_VERSION = 149;
500+
CURRENT_PROJECT_VERSION = 926;
501501
DEVELOPMENT_TEAM = EHV7XZLAHA;
502502
ENABLE_BITCODE = NO;
503503
INFOPLIST_FILE = SampleApp/Info.plist;
@@ -534,7 +534,7 @@
534534
CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppRelease.entitlements;
535535
CODE_SIGN_IDENTITY = "iPhone Distribution";
536536
CODE_SIGN_STYLE = Manual;
537-
CURRENT_PROJECT_VERSION = 149;
537+
CURRENT_PROJECT_VERSION = 926;
538538
DEVELOPMENT_TEAM = EHV7XZLAHA;
539539
INFOPLIST_FILE = SampleApp/Info.plist;
540540
LD_RUNPATH_SEARCH_PATHS = (

package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,7 @@ exports[`Thread should match thread snapshot 1`] = `
18961896
/>
18971897
</View>
18981898
<View
1899+
layout={BaseAnimationMock {}}
18991900
onLayout={[Function]}
19001901
style={
19011902
[

0 commit comments

Comments
 (0)