Skip to content

Commit 64258c8

Browse files
SergioEstevaoSergioEstevao
committed
Update script to use build step instead of orb option.
1 parent 85505c7 commit 64258c8

3 files changed

Lines changed: 93 additions & 42 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,15 @@ orbs:
44
# Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs
55
ios: wordpress-mobile/ios@1.0
66

7-
executors:
8-
default:
9-
description: |
10-
An executor with sensible defaults for iOS builds.
11-
See supported versions here: https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
12-
macos:
13-
xcode: "12.1.0"
14-
15-
jobs:
16-
custom-carthage:
17-
executor:
18-
name: default
19-
steps:
20-
- run:
21-
name: Custom Carthage
22-
command: cd Example && ./carthage.sh build --platform iOS && cd ..
23-
247
workflows:
258
test_and_validate:
269
jobs:
27-
- custom-carthage
28-
10+
- ios/xcode-build:
11+
name: Carthage Update
12+
xcode-version: "12.1.0"
13+
workspace: Aztec.workspace
14+
scheme: Carthage Update
15+
ios-version: "14.0"
2916
- ios/test:
3017
name: Test
3118
xcode-version: "12.1.0"
@@ -34,7 +21,7 @@ workflows:
3421
workspace: Aztec.xcworkspace
3522
scheme: AztecExample
3623
device: iPhone 11
37-
ios-version: "13.0"
24+
ios-version: "14.0"
3825

3926
- ios/validate-podspec:
4027
name: Validate WordPress-Aztec-iOS.podspec

‎Aztec.xcodeproj/xcshareddata/xcschemes/Carthage Update.xcscheme‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
18-
BuildableName = "Carthage Update"
19-
BlueprintName = "Carthage Update"
20-
ReferencedContainer = "container:Aztec.xcodeproj">
17+
BlueprintIdentifier = "FFB801A425A4DE2000B5A78F"
18+
BuildableName = "Chartage Update"
19+
BlueprintName = "Chartage Update"
20+
ReferencedContainer = "container:Example/AztecExample.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -40,31 +40,13 @@
4040
debugDocumentVersioning = "YES"
4141
debugServiceExtension = "internal"
4242
allowLocationSimulation = "YES">
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
47-
BuildableName = "Carthage Update"
48-
BlueprintName = "Carthage Update"
49-
ReferencedContainer = "container:Aztec.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
5243
</LaunchAction>
5344
<ProfileAction
5445
buildConfiguration = "Release"
5546
shouldUseLaunchSchemeArgsEnv = "YES"
5647
savedToolIdentifier = ""
5748
useCustomWorkingDirectory = "NO"
5849
debugDocumentVersioning = "YES">
59-
<MacroExpansion>
60-
<BuildableReference
61-
BuildableIdentifier = "primary"
62-
BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
63-
BuildableName = "Carthage Update"
64-
BlueprintName = "Carthage Update"
65-
ReferencedContainer = "container:Aztec.xcodeproj">
66-
</BuildableReference>
67-
</MacroExpansion>
6850
</ProfileAction>
6951
<AnalyzeAction
7052
buildConfiguration = "Debug">

‎Example/AztecExample.xcodeproj/project.pbxproj‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@
66
objectVersion = 46;
77
objects = {
88

9+
/* Begin PBXAggregateTarget section */
10+
FFB801A425A4DE2000B5A78F /* Chartage Update */ = {
11+
isa = PBXAggregateTarget;
12+
buildConfigurationList = FFB801AC25A4DE2000B5A78F /* Build configuration list for PBXAggregateTarget "Chartage Update" */;
13+
buildPhases = (
14+
FFB801AF25A4DE2A00B5A78F /* ShellScript */,
15+
);
16+
dependencies = (
17+
);
18+
name = "Chartage Update";
19+
productName = ChartageBuild;
20+
};
21+
/* End PBXAggregateTarget section */
22+
923
/* Begin PBXBuildFile section */
1024
59280F2A1D47CAF40083FB59 /* content.html in Resources */ = {isa = PBXBuildFile; fileRef = 59280F281D47CAF40083FB59 /* content.html */; };
1125
59280F2B1D47CAF40083FB59 /* SampleText.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 59280F291D47CAF40083FB59 /* SampleText.rtf */; };
@@ -394,6 +408,10 @@
394408
ProvisioningStyle = Automatic;
395409
TestTargetID = 607FACCF1AFB9204008FA782;
396410
};
411+
FFB801A425A4DE2000B5A78F = {
412+
CreatedOnToolsVersion = 12.3;
413+
ProvisioningStyle = Automatic;
414+
};
397415
};
398416
};
399417
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "AztecExample" */;
@@ -421,6 +439,7 @@
421439
targets = (
422440
607FACCF1AFB9204008FA782 /* AztecExample */,
423441
CC400F161E9EC04200859AB4 /* AztecUITests */,
442+
FFB801A425A4DE2000B5A78F /* Chartage Update */,
424443
);
425444
};
426445
/* End PBXProject section */
@@ -488,6 +507,26 @@
488507
};
489508
/* End PBXResourcesBuildPhase section */
490509

510+
/* Begin PBXShellScriptBuildPhase section */
511+
FFB801AF25A4DE2A00B5A78F /* ShellScript */ = {
512+
isa = PBXShellScriptBuildPhase;
513+
buildActionMask = 2147483647;
514+
files = (
515+
);
516+
inputFileListPaths = (
517+
);
518+
inputPaths = (
519+
);
520+
outputFileListPaths = (
521+
);
522+
outputPaths = (
523+
);
524+
runOnlyForDeploymentPostprocessing = 0;
525+
shellPath = /bin/sh;
526+
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n./carthage.sh build --platform iOS\n";
527+
};
528+
/* End PBXShellScriptBuildPhase section */
529+
491530
/* Begin PBXSourcesBuildPhase section */
492531
607FACCC1AFB9204008FA782 /* Sources */ = {
493532
isa = PBXSourcesBuildPhase;
@@ -952,6 +991,38 @@
952991
};
953992
name = "Release-Alpha";
954993
};
994+
FFB801A525A4DE2000B5A78F /* Debug */ = {
995+
isa = XCBuildConfiguration;
996+
buildSettings = {
997+
CODE_SIGN_STYLE = Automatic;
998+
PRODUCT_NAME = "$(TARGET_NAME)";
999+
};
1000+
name = Debug;
1001+
};
1002+
FFB801A625A4DE2000B5A78F /* Release-Alpha */ = {
1003+
isa = XCBuildConfiguration;
1004+
buildSettings = {
1005+
CODE_SIGN_STYLE = Automatic;
1006+
PRODUCT_NAME = "$(TARGET_NAME)";
1007+
};
1008+
name = "Release-Alpha";
1009+
};
1010+
FFB801A725A4DE2000B5A78F /* Release */ = {
1011+
isa = XCBuildConfiguration;
1012+
buildSettings = {
1013+
CODE_SIGN_STYLE = Automatic;
1014+
PRODUCT_NAME = "$(TARGET_NAME)";
1015+
};
1016+
name = Release;
1017+
};
1018+
FFB801A825A4DE2000B5A78F /* Profiling */ = {
1019+
isa = XCBuildConfiguration;
1020+
buildSettings = {
1021+
CODE_SIGN_STYLE = Automatic;
1022+
PRODUCT_NAME = "$(TARGET_NAME)";
1023+
};
1024+
name = Profiling;
1025+
};
9551026
/* End XCBuildConfiguration section */
9561027

9571028
/* Begin XCConfigurationList section */
@@ -988,6 +1059,17 @@
9881059
defaultConfigurationIsVisible = 0;
9891060
defaultConfigurationName = Release;
9901061
};
1062+
FFB801AC25A4DE2000B5A78F /* Build configuration list for PBXAggregateTarget "Chartage Update" */ = {
1063+
isa = XCConfigurationList;
1064+
buildConfigurations = (
1065+
FFB801A525A4DE2000B5A78F /* Debug */,
1066+
FFB801A625A4DE2000B5A78F /* Release-Alpha */,
1067+
FFB801A725A4DE2000B5A78F /* Release */,
1068+
FFB801A825A4DE2000B5A78F /* Profiling */,
1069+
);
1070+
defaultConfigurationIsVisible = 0;
1071+
defaultConfigurationName = Release;
1072+
};
9911073
/* End XCConfigurationList section */
9921074
};
9931075
rootObject = 607FACC81AFB9204008FA782 /* Project object */;

0 commit comments

Comments
 (0)