Skip to content

Commit 3056c4e

Browse files
HeyImChrisacoates-msmarty-wangMo Wangappden
authored
Add some robustness to the CI and switch to Xcode 12 (#709)
* Update RCTCxxBridge.mm * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * Update RCTCxxBridge.mm * add quotes * switch to catalina * update pods to 10.15 * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * add quotes * switch to catalina * update pods to 10.15 * upgrade version requirements to n-2 for osx * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * add quotes * switch to catalina * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * add quotes * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * add quotes * CI should run on PRs to future stable branches (#718) * Pull in header's C declaration to stop symbol mangling (#728) * Update RCTCxxBridge.mm * Update RCTCxxBridge.mm * fix undefined extern c symbol * scroll content with animation (#725) Summary: please see test plan Test Plan: |Before|After| |{F371503806}|{F371499708}| Reviewers: skyle Reviewed By: skyle Subscribers: zackargyle Differential Revision: https://phabricator.intern.facebook.com/D26354172 Tasks: T84165504 Signature: 26354172:1612920735:2cd8455b1bae06ee555bd98cfd41c4dfb29c288e Co-authored-by: Mo Wang <[email protected]> * Fix missing props on secure text input (#719) * Enable animated gif playback on Mac (#724) * enable gif for mac Summary: I verify that it works for Zeratul as well. It also works regardless turbo module is enabled or not. Test Plan: |{F369886201}|{F369889196}| Reviewers: skyle Reviewed By: skyle Subscribers: zackargyle Differential Revision: https://phabricator.intern.facebook.com/D26272145 Tasks: T82742678 Signature: 26272145:1612513052:520a8b0b3ab4b211c953b3225c6c96ffb8a29fc5 * bypass setImage logic when it is Mac Summary: as titled Test Plan: {F370138978} {F370139033} Reviewers: skyle Reviewed By: skyle Subscribers: zackargyle Differential Revision: https://phabricator.intern.facebook.com/D26288169 Signature: 26288169:1612565769:8f779fe01614e3399ac3e484853bb61246210ff4 * address PR comments * address PR comments 1 Co-authored-by: Mo Wang <[email protected]> * Add explicit Tab support to keyboarding (#723) * Update RCTCxxBridge.mm * Update RCTCxxBridge.mm * add explicit tab support * missing tab validity check * Fix Deadlock in RCTi18nUtil (iOS) (#733) * Initial Commit * Fix typo * Fix default initialization of isRTLAllowed and documentation * use BOOL, remove superfluous readwrite decorator * Fix another typo * Add TODO Marker * update to macOS 10.15 * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * add quotes * switch to catalina * update pods to 10.15 * upgrade version requirements to n-2 for osx * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * add quotes * switch to catalina * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * add quotes * make CI xcode versioning more robust to xcode12 * update to xcode 12.4 * use apple variables file * add quotes * update to macOS 10.15 * update to xcode 12.4 * use apple variables file * switch to catalina * 10.14 * CI has to run on 10.15.4 or later * fix up pod errors * upgrade iphone simulator * iphone 13 * remove old post install script * iphone 8 * Restore Podfile.lock to see if it fixes CI * Restore compiler flags in TurboModuleCxx-WinRTPort * Remove macOS arm64 build divergence * Remove building all ARCHS temporarily * Override ONLY_ACTIVE_ARCH in release builds too * Push iOS 14 snapshots Co-authored-by: Andrew Coates <[email protected]> Co-authored-by: Mo <[email protected]> Co-authored-by: Mo Wang <[email protected]> Co-authored-by: Scott Kyle <[email protected]> Co-authored-by: Saad Najmi <[email protected]> Co-authored-by: Anand Rajeswaran <[email protected]>
1 parent 11fa4fd commit 3056c4e

File tree

53 files changed

+117
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+117
-110
lines changed

‎.ado/ado-test-cleanup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -ex
33

44
# Script used by the Azure DevOps build agent to cleanup the packager and web socket server
5-
# after the XCode test step has completed
5+
# after the Xcode test step has completed
66

77
# kill whatever is occupying port 8081 (packager)
88
lsof -i tcp:8081 | awk 'NR!=1 {print $2}' | xargs kill

‎.ado/apple-pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
- template: templates/apple-job-javascript.yml
3232
parameters:
3333
apply_office_patches: $(apply_office_patches)
34+
slice_name: $(slice_name)
35+
xcode_version: $(xcode_version)
3436

3537
- job: AppleRNPR
3638
displayName: Apple React Native PR
@@ -84,6 +86,8 @@ jobs:
8486
xcode_actions_release: $(xcode_actions_release)
8587
xcode_destination: $(xcode_destination)
8688
apply_office_patches: $(apply_office_patches)
89+
slice_name: $(slice_name)
90+
xcode_version: $(xcode_version)
8791

8892
- job: CliInit
8993
displayName: Verify react-native-macos-init

‎.ado/templates/apple-job-javascript.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
parameters:
22
apply_office_patches: ''
3+
slice_name: ''
4+
xcode_version: ''
35

46
steps:
57
- template: apple-node-setup.yml
68

9+
# Task Group: Xcode select proper version
710
- template: apple-xcode-select.yml
11+
parameters:
12+
slice_name: ${{ parameters.slice_name }}
13+
xcode_version: ${{ parameters.xcode_version }}
814

915
- template: apple-droid-node-patching.yml
1016
parameters:

‎.ado/templates/apple-job-react-native.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ parameters:
77
xcode_actions_release: ''
88
xcode_destination: ''
99
apply_office_patches: ''
10+
slice_name: ''
11+
xcode_version: ''
1012

1113
steps:
1214
# Clean DerivedData
@@ -18,6 +20,9 @@ steps:
1820

1921
# Task Group: Xcode select proper version
2022
- template: apple-xcode-select.yml
23+
parameters:
24+
slice_name: ${{ parameters.slice_name }}
25+
xcode_version: ${{ parameters.xcode_version }}
2126

2227
- template: apple-droid-node-patching.yml
2328
parameters:

‎.ado/templates/apple-xcode-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ parameters:
1010

1111
steps:
1212
- task: Xcode@5
13-
displayName: 'XCode ${{ parameters.xcode_actions }} ${{ parameters.xcode_configuration }} ${{ parameters.xcode_sdk }} ${{ parameters.xcode_scheme }}'
13+
displayName: 'Xcode ${{ parameters.xcode_actions }} ${{ parameters.xcode_configuration }} ${{ parameters.xcode_sdk }} ${{ parameters.xcode_scheme }}'
1414
inputs:
1515
actions: '${{ parameters.xcode_actions }}'
1616
configuration: ${{ parameters.xcode_configuration }}
@@ -21,7 +21,7 @@ steps:
2121
signingOption: auto
2222
packageApp: false
2323
teamId: '$(XCodeSigningMicrosoftTeamID)'
24-
args: '-destination "${{ parameters.xcode_destination }}" ONLY_ACTIVE_ARCH=NO -verbose -UseModernBuildSystem=NO -derivedDataPath DerivedData ${{ parameters.xcode_extraArgs }}'
24+
args: '-destination "${{ parameters.xcode_destination }}" ONLY_ACTIVE_ARCH=YES -verbose -derivedDataPath DerivedData ${{ parameters.xcode_extraArgs }}'
2525
exportPath: '$(agent.builddirectory)/output/${{ parameters.xcode_sdk }}/${{ parameters.xcode_configuration }}'
2626
useXcpretty: ${{ parameters.xcode_useXcpretty }}
2727
publishJUnitResults: ${{ parameters.xcode_useXcpretty }}

‎.ado/templates/apple-xcode-select.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#
2-
# Task Group: XCode select proper version
2+
# Task Group: Xcode select proper version
33
#
4+
5+
parameters:
6+
slice_name: ''
7+
xcode_version: ''
8+
49
steps:
510
- bash: |
6-
sudo xcode-select --switch '/Applications/Xcode_11.2.1.app'
7-
displayName: 'Switch to XCode 11.2.1'
11+
sudo xcode-select --switch '${{ parameters.xcode_version }}'
12+
displayName: Switch Xcode version ${{ parameters.slice_name }}
813
failOnStderr: true

‎.ado/variables/mac.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
variables:
2-
VmImage: macOS-10.14
2+
VmImage: macOS-10.15
3+
slice_name: 'Xcode_12_4'
4+
xcode_version: '/Applications/Xcode_12.4.app'

‎Libraries/ART/React-ART.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
2323
s.homepage = "https://reactnative.dev/"
2424
s.license = package["license"]
2525
s.author = "Facebook, Inc. and its affiliates"
26-
s.platforms = { :ios => "10.0", :tvos => "10.0", :osx => "10.13" } # TODO(macOS GH#214)
26+
s.platforms = { :ios => "10.0", :tvos => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
2727
s.source = source
2828
s.source_files = "**/*.{m}"
2929
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"

‎Libraries/ActionSheetIOS/React-RCTActionSheet.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
2424
s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
2525
s.license = package["license"]
2626
s.author = "Facebook, Inc. and its affiliates"
27-
s.platforms = { :ios => "10.0", :tvos => "10.0", :osx => "10.13" } # TODO(macOS GH#214)
27+
s.platforms = { :ios => "10.0", :tvos => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
2828
s.source = source
2929
s.source_files = "*.{m}"
3030
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"

‎Libraries/Blob/React-RCTBlob.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
2626
s.homepage = "https://reactnative.dev/"
2727
s.license = package["license"]
2828
s.author = "Facebook, Inc. and its affiliates"
29-
s.platforms = { :ios => "10.0", :tvos => "10.0", :osx => "10.13" } # TODO(macOS GH#214)
29+
s.platforms = { :ios => "10.0", :tvos => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
3030
s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness'
3131
s.source = source
3232
s.source_files = "*.{m,mm}"

0 commit comments

Comments
 (0)