Merge pull request #579 from session-foundation/dev

Release 2.14.3

Author: mpretty-cyro

.drone.jsonnet

@@ -77,10 +77,7 @@ local clean_up_old_test_sims_on_commit_trigger = {
       {
         name: 'Build and Run Tests',
         commands: [
-          'echo "Explicitly running unit tests on \'App_Store_Release\' configuration to ensure optimisation behaviour is consistent"',
-          'echo "If tests fail inconsistently from local builds this is likely the difference"',
-          'echo ""',
-          'NSUnbufferedIO=YES xcodebuild test -project Session.xcodeproj -scheme Session -derivedDataPath ./build/derivedData -resultBundlePath ./build/artifacts/testResults.xcresult -parallelizeTargets -configuration "App_Store_Release" -destination "platform=iOS Simulator,id=$(<./build/artifacts/sim_uuid)" -parallel-testing-enabled NO -test-timeouts-enabled YES -maximum-test-execution-time-allowance 10 -collect-test-diagnostics never ENABLE_TESTABILITY=YES 2>&1 | xcbeautify --is-ci',
+          './Scripts/build_ci.sh test -resultBundlePath ./build/artifacts/testResults.xcresult -destination "platform=iOS Simulator,id=$(<./build/artifacts/sim_uuid)" -parallel-testing-enabled NO -test-timeouts-enabled YES -maximum-test-execution-time-allowance 10 -collect-test-diagnostics never ENABLE_TESTABILITY=YES',
         ],
         depends_on: [
           'Reset SPM Cache if Needed',
@@ -99,31 +96,27 @@ local clean_up_old_test_sims_on_commit_trigger = {
           status: ['success', 'failure'],
         },
       },
-      {
-        name: 'Check for Build/Test Failures',
-        commands: [
-          'echo "Checking for build errors or test failures in xcresult bundle..."',
-          'xcresultparser --output-format cli --failed-tests-only ./build/artifacts/testResults.xcresult'
-        ],
-        depends_on: ['Build and Run Tests']
-      },
       {
         name: 'Log Failed Test Summary',
         commands: [
           'echo "--- FAILED TESTS ---"',
-          'xcresultparser --output-format cli --failed-tests-only ./build/artifacts/testResults.xcresult'
+          'xcresultparser --output-format cli --failed-tests-only ./build/artifacts/testResults.xcresult',
+          'exit 1' // Always fail if this runs to make it more obvious in the UI
         ],
-        depends_on: ['Check for Build/Test Failures'],
+        depends_on: ['Build and Run Tests'],
         when: {
           status: ['failure'], // Only run this on failure
         },
       },
       {
-        name: 'Convert xcresult to xml',
+        name: 'Generate Code Coverage Report',
         commands: [
           'xcresultparser --output-format cobertura ./build/artifacts/testResults.xcresult > ./build/artifacts/coverage.xml',
         ],
         depends_on: ['Build and Run Tests'],
+        when: {
+          status: ['success'],
+        },
       },
     ],
   },
@@ -157,8 +150,7 @@ local clean_up_old_test_sims_on_commit_trigger = {
       {
         name: 'Build',
         commands: [
-          'mkdir build',
-          'NSUnbufferedIO=YES && xcodebuild archive -project Session.xcodeproj -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -configuration "App_Store_Release" -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" | xcbeautify --is-ci',
+          './Scripts/build_ci.sh archive -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator"',
         ],
         depends_on: [
           'Reset SPM Cache if Needed',

Scripts/EmojiGenerator.swift

@@ -53,7 +53,7 @@ enum RemoteModel {
         case flags = "Flags"
         case components = "Component"
 
-        var localizedKey: String = {
+        var localizedKey: String {
             switch self {
                 case .smileys:
                     return "Smileys"
@@ -77,8 +77,8 @@ enum RemoteModel {
                     return "Flags"
                 case .components:
                     return "Component"
-                }
-        }()
+            }
+        }
     }
 
     static func fetchEmojiData() throws -> Data {
@@ -569,8 +569,9 @@ extension EmojiGenerator {
                             fileHandle.indent {
                                 let stringKey = "emojiCategory\(category.localizedKey)"
                                 let stringComment = "The name for the emoji category '\(category.rawValue)'"
-
-                                fileHandle.writeLine("return NSLocalizedString(\"\(stringKey)\", comment: \"\(stringComment)\")")
+                                
+                                fileHandle.writeLine("// \(stringComment)")
+                                fileHandle.writeLine("return \"\(stringKey)\".localized()")
                             }
                         }
                         fileHandle.writeLine("}")

Scripts/build_ci.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+IFS=$' \t\n'
+
+set -euo pipefail
+
+if [ $# -lt 1 ]; then
+    echo "Error: Missing mode. Usage: $0 [test|archive] [unique_xcodebuild_args...]"
+    exit 1
+fi
+
+MODE="$1"
+shift
+
+COMMON_ARGS=(
+    -project Session.xcodeproj
+    -scheme Session
+    -derivedDataPath ./build/derivedData
+    -parallelizeTargets
+    -configuration "App_Store_Release"
+)
+
+UNIQUE_ARGS=("$@")
+XCODEBUILD_RAW_LOG=$(mktemp)
+
+trap 'rm -f "$XCODEBUILD_RAW_LOG"' EXIT
+
+if [[ "$MODE" == "test" ]]; then
+    
+    echo "--- Running Build and Unit Tests (App_Store_Release) ---"
+    
+    xcodebuild_exit_code=0
+    
+    # We wrap the pipeline in parentheses to capture the exit code of xcodebuild
+    # which is at PIPESTATUS[0]. We do not use tee to a file here, as the complexity
+    # of reading back the UUID is not necessary if we pass it via args.
+    (
+        NSUnbufferedIO=YES xcodebuild test \
+            "${COMMON_ARGS[@]}" \
+            "${UNIQUE_ARGS[@]}" 2>&1 | tee "$XCODEBUILD_RAW_LOG" | xcbeautify --is-ci
+    ) || xcodebuild_exit_code=${PIPESTATUS[0]}
+
+    echo ""
+    echo "--- xcodebuild finished with exit code: $xcodebuild_exit_code ---"
+    
+    if [ "$xcodebuild_exit_code" -eq 0 ]; then
+        echo "✅ All tests passed and build succeeded!"
+        exit 0
+    fi
+
+    echo ""
+    echo "🔴 Build failed"
+    echo "----------------------------------------------------"
+    echo "Checking for test failures in xcresult bundle..."
+
+    xcresultparser --output-format cli --no-test-result --coverage ./build/artifacts/testResults.xcresult
+    parser_output=$(xcresultparser --output-format cli --no-test-result ./build/artifacts/testResults.xcresult)
+
+    build_errors_count=$(echo "$parser_output" | grep "Number of errors" | awk '{print $NF}')
+    failed_tests_count=$(echo "$parser_output" | grep "Number of failed tests" | awk '{print $NF}')
+
+    if [ "${build_errors_count:-0}" -gt 0 ] || [ "${failed_tests_count:-0}" -gt 0 ]; then
+        echo ""
+        echo "🔴 Found $build_errors_count build error(s) and $failed_tests_count failed test(s) in the xcresult bundle."
+        exit 1
+    else
+        echo "No test failures found in results. Failure was likely a build error."
+        echo ""
+
+        echo "--- Summary of Potential Build Errors ---"
+        grep -E --color=always '(:[0-9]+:[0-9]+: error:)|(ld: error:)|(error: linker command failed)|(PhaseScriptExecution)|(rsync error:)' "$XCODEBUILD_RAW_LOG" || true
+        echo ""
+        echo "--- End of Raw Log ---"
+        tail -n 20 "$XCODEBUILD_RAW_LOG"
+        echo "-------------------------"
+        exit "$xcodebuild_exit_code"
+    fi
+
+    echo "----------------------------------------------------"
+    exit "$xcodebuild_exit_code"
+    
+elif [[ "$MODE" == "archive" ]]; then
+    
+    echo "--- Running Simulator Archive Build (App_Store_Release) ---"
+    
+    NSUnbufferedIO=YES xcodebuild archive \
+        "${COMMON_ARGS[@]}" \
+        "${UNIQUE_ARGS[@]}" 2>&1 | xcbeautify --is-ci
+    
+else
+    echo "Error: Invalid mode '$MODE' specified. Use 'test' or 'archive'."
+    exit 1
+fi