Merge pull request #260 from WeTransfer/chore/bump-danger

Fix testing pipeline and re-enable Danger

Author: lc-bs

Bitrise/testing_bitrise.yml

@@ -57,8 +57,9 @@ workflows:
               exit 0
             fi
 
-            # Get the latest master branch for WeTransfer-iOS-CI if the submodule exists
-            git submodule update --remote --no-fetch Submodules/WeTransfer-iOS-CI
+            # Update WeTransfer-iOS-CI if the submodule exists
+            # (pulls the submodule at the commit pointed by the parent repo!)
+            git submodule update Submodules/WeTransfer-iOS-CI
         title: Update WeTransfer-iOS-CI submodule
     - script:
         run_if: .IsCI
@@ -115,14 +116,14 @@ workflows:
   wetransfer_pr_testing:
     before_run:
     - pr_testing
-# Uncomment once Danger adopts Xcode 16
-#    after_run:
-#    - workflow_danger
+    after_run:
+    - workflow_danger
 
   workflow_danger:
     steps:
     - script:
         title: Set up Danger Caching
+        is_always_run: true
         inputs:
         - content: |-
             if [ "$BITRISEIO_GIT_REPOSITORY_SLUG" == "WeTransfer-iOS-CI" ]; then
@@ -132,11 +133,13 @@ workflows:
                 envman add --key DANGER_CHECKSUM_PATH --value "Submodules/WeTransfer-iOS-CI/Package.resolved"
                 envman add --key DANGER_BUILD_DIRECTORY --value "Submodules/WeTransfer-iOS-CI/.build"
             fi
-    - restore-cache@1:      
+    - restore-cache@1:
+        is_always_run: true      
         inputs:          
         - key: danger-build-cache-{{ checksum "$DANGER_CHECKSUM_PATH" }}
     - script:
         title: Run Danger
+        is_always_run: true
         inputs:
         - content: |-
             #!/usr/bin/env bash
@@ -158,6 +161,7 @@ workflows:
                 ./danger-swift ci --cwd ../../
             fi
     - save-cache@1:
+        is_always_run: true
         inputs:
         - key: danger-build-cache-{{ checksum "$DANGER_CHECKSUM_PATH" }}
         - paths: "$DANGER_BUILD_DIRECTORY"

Fastlane/testing_lanes.rb

@@ -30,7 +30,7 @@
 
   begin
     if options[:destination].nil?
-      device = options[:device] || 'iPhone 14'
+      device = options[:device] || 'iPhone 16 (18.0)'
     end
 
     if options[:package_path].nil?
@@ -64,7 +64,7 @@
       destination: options[:destination],
       code_coverage: code_coverage_enabled,
       disable_concurrent_testing: true, # As of 27th October 2021, this seems to not be working anymore. We need `parallel-testing-enabled NO` instead.
-      fail_build: false,
+      fail_build: true,
       skip_slack: true,
       output_types: '',
       # xcodebuild_formatter: '', # Add this to get verbose logging by disabling xcbeautify.

Package.resolved

@@ -11,7 +11,7 @@ let package = Package(
         .library(name: "DangerDeps", type: .dynamic, targets: ["DangerDependencies"])
     ],
     dependencies: [
-        .package(name: "danger-swift", url: "https://github.com/danger/swift", from: "3.19.1"),
+        .package(name: "danger-swift", url: "https://github.com/danger/swift", from: "3.20.2"),
         .package(path: "WeTransferPRLinter")
     ],
     targets: [

Package.swift

@@ -15,12 +15,9 @@ let package = Package(
         )
     ],
     dependencies: [
-        // Local package is required for development since Danger does not support Swift 5.5 correctly yet with Danger-Plugin testing.
-//         .package(name: "danger-swift", path: "../../../../../Forks/swift"),
-        .package(name: "danger-swift", url: "https://github.com/danger/swift.git", from: "3.12.1"),
-//        .package(name: "danger-swift", url: "https://github.com/AvdLee/swift.git", .branch("master")),
+        .package(name: "danger-swift", url: "https://github.com/danger/swift", from: "3.20.2"),
         .package(name: "Files", url: "https://github.com/JohnSundell/Files", from: "4.1.1"),
-        .package(name: "XCResultKit", url: "https://github.com/davidahouse/XCResultKit.git", from: "0.9.2")
+        .package(name: "XCResultKit", url: "https://github.com/davidahouse/XCResultKit.git", from: "1.2.1")
     ],
     targets: [
         .target(

WeTransferPRLinter/Package.resolved

@@ -94,8 +94,9 @@ public enum WeTransferPRLinter {
             ".build/",
             ".spm-build/"
         ]
+        let shouldReportWarnings = environmentVariables["REPORT_WARNINGS"]?.lowercased() == "true"
 
-        summaryReporter.reportXCResultSummary(for: xcResultFiles, using: danger, fileManager: fileManager) { result in
+        summaryReporter.reportXCResultSummary(for: xcResultFiles, using: danger, shouldReportWarnings: shouldReportWarnings, fileManager: fileManager) { result in
             guard let file = result.file else {
                 return true
             }

WeTransferPRLinter/Package.swift

@@ -60,7 +60,7 @@ extension ActionTestSummary: XCResultItemsConvertible {
         guard let title = activitySummaries.first?.title else {
             return []
         }
-        let message = "**\(identifier):**<br/>\(title)"
+        let message = "**\(identifier ?? "<unknown>"):**<br/>\(title)"
         return [XCResultItem(message: message, category: .warning)]
     }
 }

WeTransferPRLinter/Sources/WeTransferPRLinter/WeTransferPRLinter.swift

@@ -83,7 +83,7 @@ extension ActionTestPlanRunSummaries {
         return slowestTests.compactMap { testMetadata in
             guard let duration = testMetadata.duration else { return nil }
             let durationString = String(format: "%.3fs", duration)
-            return XCResultItem(message: "Slowest test: \(testMetadata.identifier) (\(durationString))", category: .message)
+            return XCResultItem(message: "Slowest test: \(testMetadata.identifier ?? "<unknown>") (\(durationString))", category: .message)
         }
     }
 }
@@ -188,11 +188,11 @@ extension ActionTestSummaryGroup {
 
 extension [ActionTestMetadata] {
     private var successIdentifiers: Set<String> {
-        Set<String>(filter { $0.testStatus == "Success" }.map(\.identifier))
+        Set<String>(filter { $0.testStatus == "Success" }.compactMap(\.identifier))
     }
 
     private var failedIdentifiers: Set<String> {
-        Set<String>(filter { $0.testStatus == "Failure" }.map(\.identifier))
+        Set<String>(filter { $0.testStatus == "Failure" }.compactMap(\.identifier))
     }
 
     var skipped: [ActionTestMetadata] {

WeTransferPRLinter/Sources/WeTransferPRLinter/XCResultReporting/ResultItems/IssueSummaries.swift

@@ -28,13 +28,10 @@ struct XCResultCoverageReporter {
                 $0?.summaries.flatMap { $0.testableSummaries.compactMap(\.targetName) }
             }
             .flatMap { $0 }
-            let coverageTargets = testTargetNames.map { targetName -> String in
-                targetName.replacingOccurrences(of: "Tests", with: "")
-            }
 
             markdown += coverage.targets
                 .compactMap { target in
-                    guard coverageTargets.contains(target.coverageTargetName) else { return nil }
+                    guard testTargetNames.contains(target.coverageTargetName) else { return nil }
                     return "\(target.name) | \(target.coverageDescription)% | \(target.lineCoverage > minimumCoverage ? "✅" : "⚠️")\n"
                 }
                 .joined()