Skip to content

Commit 85ba876

Browse files
committed
fix: exclude arm64 architecture
1 parent 00b53f5 commit 85ba876

File tree

4 files changed

+45
-112
lines changed

4 files changed

+45
-112
lines changed

lib/services/ios/xcodebuild-args-service.ts

+6
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
122122
args.push("ONLY_ACTIVE_ARCH=NO");
123123
}
124124

125+
if (!devicesArchitectures.includes("arm64")) {
126+
// don't build form arm64 if we have no arm64 targets
127+
// todo: re-visit if arm64 simulators start failing
128+
args.push("EXCLUDED_ARCHS=arm64");
129+
}
130+
125131
return args;
126132
}
127133

package-lock.json

+33-109
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nativescript",
33
"preferGlobal": true,
4-
"version": "7.0.8",
4+
"version": "7.0.9-rc.0",
55
"author": "NativeScript <[email protected]>",
66
"description": "Command-line interface for building NativeScript projects",
77
"bin": {
@@ -71,7 +71,7 @@
7171
"inquirer": "7.3.3",
7272
"ios-device-lib": "0.7.3",
7373
"ios-mobileprovision-finder": "1.0.11",
74-
"ios-sim-portable": "4.2.0",
74+
"ios-sim-portable": "4.2.1",
7575
"istextorbinary": "5.9.0",
7676
"jimp": "0.14.0",
7777
"libnpmconfig": "1.2.1",

test/services/ios/xcodebuild-args-service.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ describe("xcodebuildArgsService", () => {
9595

9696
const expectedArgs = [
9797
"ONLY_ACTIVE_ARCH=NO",
98+
"EXCLUDED_ARCHS=arm64",
9899
"CODE_SIGN_IDENTITY=",
99100
"build",
100101
"-configuration",
@@ -136,7 +137,9 @@ describe("xcodebuildArgsService", () => {
136137
{
137138
name: "should return correct args when no connected devices",
138139
connectedDevices: [],
139-
expectedArgs: ["-sdk", "iphoneos"].concat(getCommonArgs()),
140+
expectedArgs: ["EXCLUDED_ARCHS=arm64", "-sdk", "iphoneos"].concat(
141+
getCommonArgs()
142+
),
140143
},
141144
];
142145

0 commit comments

Comments
 (0)