Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ steps:
command: |
install_gems
bundle exec fastlane ios test
plugins: *common_plugins
plugins:
- automattic/a8c-ci-toolkit#6.0.0
- test-collector#v1.11.0:
files: .build/report.junit
format: junit
missing-error: 0
api-token-env-name: BUILDKITE_ANALYTICS_TOKEN
artifact_paths: ".build/logs/*.log"

######################
Expand All @@ -33,7 +39,13 @@ steps:
command: |
install_gems
bundle exec fastlane mac test
plugins: *common_plugins
plugins:
- automattic/a8c-ci-toolkit#6.0.0
- test-collector#v1.11.0:
files: .build/report.junit
format: junit
missing-error: 0
api-token-env-name: BUILDKITE_ANALYTICS_TOKEN
artifact_paths: ".build/logs/*.log"

- label: ":swift: SwiftLint"
Expand Down
9 changes: 0 additions & 9 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ let package = Package(
// Tests dependencies
.package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.0.0"),
.package(name: "OCMock", url: "https://github.com/erikdoe/ocmock", .branch("master")),
.package(name: "BuildkiteTestCollector", url: "https://github.com/buildkite/test-collector-swift", from: "0.3.0"),
],
targets: [
// ExPlat experiments
Expand Down Expand Up @@ -150,7 +149,6 @@ let package = Package(
"AutomatticTracks",
"AutomatticTracksEvents",
"AutomatticTracksModel",
"BuildkiteTestCollector",
.product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs"),
],
path: "Tests",
Expand All @@ -162,7 +160,6 @@ let package = Package(
name: "AutomatticTracksTestsObjC",
dependencies: [
"AutomatticTracksEvents",
"BuildkiteTestCollector",
"OCMock",
],
path: "Tests/Tests/ObjC"
Expand Down
10 changes: 8 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ platform :ios do
deployment_target_version: '14.5',
prelaunch_simulator: true,
buildlog_path: BUILD_LOG_PATH,
derived_data_path: DERIVED_DATA_PATH
derived_data_path: DERIVED_DATA_PATH,
output_directory: BUILD_FOLDER,
result_bundle: true,
output_types: 'junit'
)
end
end
Expand All @@ -29,7 +32,10 @@ platform :mac do
scheme: 'TracksDemo Mac',
project: PROJECT_PATH,
buildlog_path: BUILD_LOG_PATH,
derived_data_path: DERIVED_DATA_PATH
derived_data_path: DERIVED_DATA_PATH,
output_directory: BUILD_FOLDER,
result_bundle: true,
output_types: 'junit'
)
end
end