Integrate Buildkite Test Analytics (#392)

Author: mokagio

.buildkite/pipeline.yml

@@ -1,10 +1,10 @@
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
-  - &bash_cache automattic/bash-cache#v1.5.0: ~
+  - &bash_cache automattic/bash-cache#2.7.0: ~
   # Common environment values to use with the `env` key.
   env: &common_env
-    IMAGE_ID: xcode-12.5.1
+    IMAGE_ID: xcode-13.4.1
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -13,7 +13,11 @@ steps:
   ################
   - label: "🧪 Build and Test"
     key: "test"
-    command: "build_and_test_pod"
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler
+
+      build_and_test_pod
     env: *common_env
     plugins: *common_plugins
     artifact_paths: ".build/logs/*.log"
@@ -23,7 +27,11 @@ steps:
   #################
   - label: "🔬 Validate Podspec"
     key: "validate"
-    command: "validate_podspec"
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler
+
+      validate_podspec
     env: *common_env
     plugins: *common_plugins
     artifact_paths: ".build/logs/*.log"
@@ -33,7 +41,11 @@ steps:
   #################
   - label: "🧹 Lint"
     key: "lint"
-    command: "lint_pod"
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler
+
+      lint_pod
     env: *common_env
     plugins: *common_plugins
 

.buildkite/publish-pod.sh

@@ -4,10 +4,13 @@ PODSPEC_PATH="WPMediaPicker.podspec"
 SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK
 
 echo "--- :rubygems: Setting up Gems"
+# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+gem install bundler
+
 install_gems
 
 echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"
 publish_pod $PODSPEC_PATH
 
 echo "--- :slack: Notifying Slack"
-slack_notify_pod_published $PODSPEC_PATH $SLACK_WEBHOOK
+slack_notify_pod_published $PODSPEC_PATH "$SLACK_WEBHOOK"

.ruby-version

@@ -1 +1 @@
-2.6.4
+2.7.4

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (1.8.0-beta.1)
+  - WPMediaPicker (1.8.4)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  WPMediaPicker: b71345bed88eb1b9ad6313e3410795e0f1182f47
+  WPMediaPicker: 9533160e5587939876aeeb1461a441a4e5dc4c4d
 
 PODFILE CHECKSUM: 31590cb12765a73c9da27d6ea5b8b127c095d71d
 

Example/Tests/UnitTests.xctestplan

@@ -0,0 +1,63 @@
+{
+  "configurations" : [
+    {
+      "id" : "0B1AE21B-1942-457C-8E85-D1D9F3281758",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "environmentVariableEntries" : [
+      {
+        "key" : "BUILDKITE_ANALYTICS_TOKEN",
+        "value" : "$(BUILDKITE_ANALYTICS_TOKEN)"
+      },
+      {
+        "key" : "BUILDKITE_BRANCH",
+        "value" : "$(BUILDKITE_BRANCH)"
+      },
+      {
+        "key" : "BUILDKITE_BUILD_ID",
+        "value" : "$(BUILDKITE_BUILD_ID)"
+      },
+      {
+        "key" : "BUILDKITE_BUILD_NUMBER",
+        "value" : "$(BUILDKITE_BUILD_NUMBER)"
+      },
+      {
+        "key" : "BUILDKITE_BUILD_URL",
+        "value" : "$(BUILDKITE_BUILD_URL)"
+      },
+      {
+        "key" : "BUILDKITE_COMMIT",
+        "value" : "$(BUILDKITE_COMMIT)"
+      },
+      {
+        "key" : "BUILDKITE_JOB_ID",
+        "value" : "$(BUILDKITE_JOB_ID)"
+      },
+      {
+        "key" : "BUILDKITE_MESSAGE",
+        "value" : "$(BUILDKITE_MESSAGE)"
+      }
+    ],
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:WPMediaPicker.xcodeproj",
+      "identifier" : "6003F589195388D20070C39A",
+      "name" : "WPMediaPicker"
+    },
+    "testTimeoutsEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:WPMediaPicker.xcodeproj",
+        "identifier" : "6003F5AD195388D20070C39A",
+        "name" : "Tests"
+      }
+    }
+  ],
+  "version" : 1
+}

Example/WPMediaPicker.xcodeproj/project.pbxproj

@@ -3,13 +3,14 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		173B215327873F2E00D4DD6B /* SampleCustomHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 173B215227873F2E00D4DD6B /* SampleCustomHeaderView.m */; };
 		17475FB81FB46DED00252689 /* SampleCellOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 17475FB71FB46DED00252689 /* SampleCellOverlayView.m */; };
 		17F64FE01E6DDC74006C5A2B /* CustomPreviewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17F64FDF1E6DDC74006C5A2B /* CustomPreviewViewController.m */; };
+		3F3E104428A0BA870041FA5A /* BuildkiteTestCollector in Frameworks */ = {isa = PBXBuildFile; productRef = 3F3E104328A0BA870041FA5A /* BuildkiteTestCollector */; };
 		6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
 		6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
 		6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -49,6 +50,7 @@
 		17475FB71FB46DED00252689 /* SampleCellOverlayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SampleCellOverlayView.m; sourceTree = "<group>"; };
 		17F64FDE1E6DDC74006C5A2B /* CustomPreviewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomPreviewViewController.h; sourceTree = "<group>"; };
 		17F64FDF1E6DDC74006C5A2B /* CustomPreviewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomPreviewViewController.m; sourceTree = "<group>"; };
+		3F3E104528A0BAAE0041FA5A /* UnitTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnitTests.xctestplan; sourceTree = "<group>"; };
 		5709B45B57F590232B3E5DA7 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		6003F58A195388D20070C39A /* WPMediaPicker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WPMediaPicker.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -104,6 +106,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
+				3F3E104428A0BA870041FA5A /* BuildkiteTestCollector in Frameworks */,
 				6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
 				AE22BBE03B862A6657E6B66E /* libPods-Tests.a in Frameworks */,
@@ -189,6 +192,7 @@
 			children = (
 				6003F5BB195388D20070C39A /* WPDateTimeHelpersTests.m */,
 				6003F5B6195388D20070C39A /* Supporting Files */,
+				3F3E104528A0BAAE0041FA5A /* UnitTests.xctestplan */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -263,6 +267,9 @@
 				6003F5B4195388D20070C39A /* PBXTargetDependency */,
 			);
 			name = Tests;
+			packageProductDependencies = (
+				3F3E104328A0BA870041FA5A /* BuildkiteTestCollector */,
+			);
 			productName = WPMediaPickerTests;
 			productReference = 6003F5AE195388D20070C39A /* Tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
@@ -295,6 +302,9 @@
 				Base,
 			);
 			mainGroup = 6003F581195388D10070C39A;
+			packageReferences = (
+				3F3E104228A0BA870041FA5A /* XCRemoteSwiftPackageReference "test-collector-swift" */,
+			);
 			productRefGroup = 6003F58B195388D20070C39A /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -661,6 +671,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		3F3E104228A0BA870041FA5A /* XCRemoteSwiftPackageReference "test-collector-swift" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/buildkite/test-collector-swift";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.3.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		3F3E104328A0BA870041FA5A /* BuildkiteTestCollector */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 3F3E104228A0BA870041FA5A /* XCRemoteSwiftPackageReference "test-collector-swift" */;
+			productName = BuildkiteTestCollector;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 6003F582195388D10070C39A /* Project object */;
 }

Example/WPMediaPicker.xcodeproj/xcshareddata/xcschemes/WPMediaPicker-Example.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1240"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -36,6 +36,12 @@
             ReferencedContainer = "container:WPMediaPicker.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:Tests/UnitTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">