Skip to content

Commit 881e7c3

Browse files
committed
fix: Address review feedback for build targets
Remove build-sample-iOS-ObjectiveCpp-NoModules from build-samples aggregate target since it is documented as expected to fail. Add xcode-ci-SentrySampleShared as a prerequisite to individual xcode-ci-* targets whose specs reference SentrySampleShared, so running a single target works in a clean checkout. Restore top-level createIntermediateGroups and generateEmptyDirectories in the XcodeGen schema for backward compatibility with sample specs.
1 parent 5f87ee1 commit 881e7c3

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

Makefile

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ build-xcframework-sample:
230230
build-samples: \
231231
build-sample-DistributionSample \
232232
build-sample-iOS-ObjectiveC \
233-
build-sample-iOS-ObjectiveCpp-NoModules \
234233
build-sample-iOS-Swift \
235234
build-sample-iOS-Swift6 \
236235
build-sample-iOS-SwiftUI \
@@ -919,71 +918,71 @@ xcode-ci-SentrySampleShared:
919918
xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
920919

921920
.PHONY: xcode-ci-SessionReplay-CameraTest
922-
xcode-ci-SessionReplay-CameraTest:
921+
xcode-ci-SessionReplay-CameraTest: xcode-ci-SentrySampleShared
923922
xcodegen --spec Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.yml
924923

925924
.PHONY: xcode-ci-iOS-ObjectiveC
926-
xcode-ci-iOS-ObjectiveC:
925+
xcode-ci-iOS-ObjectiveC: xcode-ci-SentrySampleShared
927926
xcodegen --spec Samples/iOS-ObjectiveC/iOS-ObjectiveC.yml
928927

929928
.PHONY: xcode-ci-iOS-ObjectiveCpp-NoModules
930929
xcode-ci-iOS-ObjectiveCpp-NoModules:
931930
xcodegen --spec Samples/iOS-ObjectiveCpp-NoModules/iOS-ObjectiveCpp-NoModules.yml
932931

933932
.PHONY: xcode-ci-iOS-Swift
934-
xcode-ci-iOS-Swift:
933+
xcode-ci-iOS-Swift: xcode-ci-SentrySampleShared
935934
xcodegen --spec Samples/iOS-Swift/iOS-Swift.yml
936935

937936
.PHONY: xcode-ci-iOS-Swift6
938-
xcode-ci-iOS-Swift6:
937+
xcode-ci-iOS-Swift6: xcode-ci-SentrySampleShared
939938
xcodegen --spec Samples/iOS-Swift6/iOS-Swift6.yml
940939

941940
.PHONY: xcode-ci-iOS-SwiftUI
942-
xcode-ci-iOS-SwiftUI:
941+
xcode-ci-iOS-SwiftUI: xcode-ci-SentrySampleShared
943942
xcodegen --spec Samples/iOS-SwiftUI/iOS-SwiftUI.yml
944943

945944
.PHONY: xcode-ci-iOS-SwiftUI-SPM
946945
xcode-ci-iOS-SwiftUI-SPM:
947946
xcodegen --spec Samples/iOS-SwiftUI-SPM/iOS-SwiftUI-SPM.yml
948947

949948
.PHONY: xcode-ci-iOS-SwiftUI-Widgets
950-
xcode-ci-iOS-SwiftUI-Widgets:
949+
xcode-ci-iOS-SwiftUI-Widgets: xcode-ci-SentrySampleShared
951950
xcodegen --spec Samples/iOS-SwiftUI-Widgets/iOS-SwiftUI-Widgets.yml
952951

953952
.PHONY: xcode-ci-iOS15-SwiftUI
954-
xcode-ci-iOS15-SwiftUI:
953+
xcode-ci-iOS15-SwiftUI: xcode-ci-SentrySampleShared
955954
xcodegen --spec Samples/iOS15-SwiftUI/iOS15-SwiftUI.yml
956955

957956
.PHONY: xcode-ci-macOS-Swift
958-
xcode-ci-macOS-Swift:
957+
xcode-ci-macOS-Swift: xcode-ci-SentrySampleShared
959958
xcodegen --spec Samples/macOS-Swift/macOS-Swift.yml
960959

961960
.PHONY: xcode-ci-macOS-SwiftUI
962-
xcode-ci-macOS-SwiftUI:
961+
xcode-ci-macOS-SwiftUI: xcode-ci-SentrySampleShared
963962
xcodegen --spec Samples/macOS-SwiftUI/macOS-SwiftUI.yml
964963

965964
.PHONY: xcode-ci-macOS-SwiftUI-SPM
966965
xcode-ci-macOS-SwiftUI-SPM:
967966
xcodegen --spec Samples/macOS-SwiftUI-SPM/macOS-SwiftUI-SPM.yml
968967

969968
.PHONY: xcode-ci-tvOS-Swift
970-
xcode-ci-tvOS-Swift:
969+
xcode-ci-tvOS-Swift: xcode-ci-SentrySampleShared
971970
xcodegen --spec Samples/tvOS-Swift/tvOS-Swift.yml
972971

973972
.PHONY: xcode-ci-tvOS-SwiftUI-SPM
974973
xcode-ci-tvOS-SwiftUI-SPM:
975974
xcodegen --spec Samples/tvOS-SwiftUI-SPM/tvOS-SwiftUI-SPM.yml
976975

977976
.PHONY: xcode-ci-visionOS-Swift
978-
xcode-ci-visionOS-Swift:
977+
xcode-ci-visionOS-Swift: xcode-ci-SentrySampleShared
979978
xcodegen --spec Samples/visionOS-Swift/visionOS-Swift.yml
980979

981980
.PHONY: xcode-ci-visionOS-SwiftUI-SPM
982981
xcode-ci-visionOS-SwiftUI-SPM:
983982
xcodegen --spec Samples/visionOS-SwiftUI-SPM/visionOS-SwiftUI-SPM.yml
984983

985984
.PHONY: xcode-ci-watchOS-Swift
986-
xcode-ci-watchOS-Swift:
985+
xcode-ci-watchOS-Swift: xcode-ci-SentrySampleShared
987986
xcodegen --spec Samples/watchOS-Swift/watchOS-Swift.yml
988987

989988
.PHONY: xcode-ci-DistributionSample

schema/xcodegen.schema.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@
4747
],
4848
"description": "One or more paths to other specs"
4949
},
50+
"createIntermediateGroups": {
51+
"type": "boolean",
52+
"description": "If true, intermediate groups will be created for every path component"
53+
},
54+
"generateEmptyDirectories": {
55+
"type": "boolean",
56+
"description": "Generate empty directories in the project"
57+
},
5058
"options": {
5159
"type": "object",
5260
"properties": {

0 commit comments

Comments
 (0)