Skip to content

Add support of arm64 in Carthage build #7158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jan 27, 2022
Merged

Add support of arm64 in Carthage build #7158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
436eeed
Add support of arm64 in Carthage build
Mar 3, 2021
26e687d
Merge branch 'master' into py/carthage_arm64
Nov 4, 2021
37c9dc1
Merge branch 'master' into py/carthage_arm64
Nov 16, 2021
cc6e1b3
disable some builds
Nov 19, 2021
c2ecd46
Merge branch 'master' into py/carthage_arm64
Nov 19, 2021
9349800
remove tests
Jan 19, 2022
2a826e0
Merge branch 'master' into py/carthage_arm64
Jan 19, 2022
6d0e83c
build xcfrwk in one call
Jan 20, 2022
3fdcbe6
disable unwanted stages
Jan 20, 2022
5feedd5
Add Carthage jenkins file
Jan 20, 2022
5f29c25
undo changes in original Jenkinsfile
Jan 20, 2022
2b0c4ac
Update to last releasability changes
Jan 21, 2022
cb02abb
Remove WIP jenkinsfile
Jan 21, 2022
d859f0b
changelog
Jan 21, 2022
4a9e5ff
comments
Jan 21, 2022
d51eeb2
Disable arm64 in test builds for Carthage
Jan 21, 2022
97ac7e7
remove extra line
Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ x.y.z Release notes (yyyy-MM-dd)
* None.

### Fixed
* <How to hit and notice issue? what was the impact?> ([#????](https://github.com/realm/realm-swift/issues/????), since v?.?.?)
* None.
* Add support of arm64 in Carthage build ([#7154](https://github.com/realm/realm-cocoa/issues/7154)

<!-- ### Breaking Changes - ONLY INCLUDE FOR NEW MAJOR version -->

Expand Down
4 changes: 2 additions & 2 deletions Configuration/Base.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
TVOS_DEPLOYMENT_TARGET = 9.0;

// Disable building the arm64 simulators when using Carthage as it doesn't support them yet
// Disable building the arm64 simulators for some types of Carthage builds
REALM_ARM_ARCHS_YES = arm64 arm64e;
REALM_ARM_ARCHS = $(REALM_ARM_ARCHS_$(CARTHAGE))
REALM_ARM_ARCHS = $(REALM_ARM_ARCHS_$(REALM_CARTHAGE_ARM_DISABLED))

EXCLUDED_ARCHS[sdk=watchsimulator*] = $(REALM_ARM_ARCHS);
EXCLUDED_ARCHS[sdk=iphonesimulator*] = $(REALM_ARM_ARCHS);
Expand Down
1 change: 1 addition & 0 deletions Jenkinsfile.releasability
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ def doBuild() {
export REALM_XCODE_VERSION=${carthageXcodeVersion}
. ./scripts/swift-version.sh
set_xcode_and_swift_versions
export REALM_CARTHAGE_ARM_DISABLED='YES'

# Carthage scans every xcodeproj in the directory looking for
# targets. This can be very slow and even spuriously time out, so
Expand Down
1 change: 1 addition & 0 deletions examples/installation/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ case "$COMMAND" in
;;

test-*-*-carthage)
export REALM_CARTHAGE_ARM_DISABLED='YES'
xctest "$PLATFORM" "$LANGUAGE" CarthageExample
;;

Expand Down