Merge pull request #682 from session-foundation/dev

Release 2.15.0

Author: mpretty-cyro

.drone.jsonnet

@@ -7,9 +7,10 @@ local version_info = {
   environment: { LANG: 'en_US.UTF-8' },
   commands: [
     'git --version',
-    'xcodebuild -version',
     'xcbeautify --version',
-    'xcresultparser --version'
+    'xcresultparser --version',
+    'xcodebuild -version',
+    'xcodebuild -showsdks'
   ],
 };
 
@@ -150,7 +151,7 @@ local clean_up_old_test_sims_on_commit_trigger = {
       {
         name: 'Build',
         commands: [
-          './Scripts/build_ci.sh archive -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator"',
+          './Scripts/build_ci.sh archive -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" DEBUG_INFORMATION_FORMAT=dwarf',
         ],
         depends_on: [
           'Reset SPM Cache if Needed',

Scripts/build_ci.sh

@@ -9,6 +9,26 @@ if [ $# -lt 1 ]; then
     exit 1
 fi
 
+COMMIT_MSG="$(git log -1 --format='%s' HEAD)"
+echo "--- Log Mode Detection ---"
+echo "Latest commit message: '${COMMIT_MSG}'"
+if echo "$COMMIT_MSG" | grep -iq '^\[raw\]'; then
+    USE_RAW_LOGS=1
+    echo "⚠️  [raw] commit prefix detected – xcbeautify and xcresultparser are DISABLED."
+    echo "    Raw xcodebuild output will be emitted directly."
+    echo ""
+else
+    USE_RAW_LOGS=0
+fi
+
+echo "--- SDK Version ---"
+SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version 2>/dev/null || echo "unknown")"
+SDK_PATH="$(xcrun --sdk iphoneos --show-sdk-path 2>/dev/null || echo "unknown")"
+echo "iOS SDK version : ${SDK_VERSION}"
+echo "iOS SDK path    : ${SDK_PATH}"
+echo ""
+
+
 MODE="$1"
 shift
 
@@ -31,14 +51,23 @@ if [[ "$MODE" == "test" ]]; then
 
     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]}
+    if [[ "$USE_RAW_LOGS" -eq 1 ]]; then
+        # Raw mode: pipe directly to tee only, no xcbeautify
+        (
+            NSUnbufferedIO=YES xcodebuild test \
+                "${COMMON_ARGS[@]}" \
+                "${UNIQUE_ARGS[@]}" 2>&1 | tee "$XCODEBUILD_RAW_LOG"
+        ) || xcodebuild_exit_code=${PIPESTATUS[0]}
+    else
+        # 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]}
+    fi
 
     echo ""
     echo "--- xcodebuild finished with exit code: $xcodebuild_exit_code ---"
@@ -51,6 +80,22 @@ if [[ "$MODE" == "test" ]]; then
     echo ""
     echo "🔴 Build failed"
     echo "----------------------------------------------------"
+
+    if [[ "$USE_RAW_LOGS" -eq 1 ]]; then
+        # Raw mode: skip xcresultparser entirely, show grep summary + tail
+        echo "Skipping xcresultparser (raw mode). Scanning raw log for errors..."
+        echo ""
+        echo "--- Matched Error Lines ---"
+        grep -En --color=always \
+            '(:[0-9]+:[0-9]+: error:)|(ld: error:)|(error: linker command failed)|(PhaseScriptExecution)|(rsync error:)|(warning: .* error)|(fatal error:)' \
+            "$XCODEBUILD_RAW_LOG" || echo "(no lines matched error patterns)"
+        echo ""
+        echo "--- Last 40 Lines of Raw Log ---"
+        tail -n 40 "$XCODEBUILD_RAW_LOG"
+        echo "----------------------------------------------------"
+        exit "$xcodebuild_exit_code"
+    fi
+
     echo "Checking for test failures in xcresult bundle..."
 
     xcresultparser --output-format cli --no-test-result --coverage-report-format targets --coverage ./build/artifacts/testResults.xcresult
@@ -68,6 +113,9 @@ if [[ "$MODE" == "test" ]]; then
     else
         echo "No test failures found in results. Failure was likely a build error."
         echo ""
+        echo "💡 Tip: if no errors are visible above, retry with a [raw] commit prefix"
+        echo "   to bypass xcresultparser and see unfiltered xcodebuild output."
+        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
@@ -85,9 +133,16 @@ 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
+    if [[ "$USE_RAW_LOGS" -eq 1 ]]; then
+        # Raw mode: no xcbeautify
+        NSUnbufferedIO=YES xcodebuild archive \
+            "${COMMON_ARGS[@]}" \
+            "${UNIQUE_ARGS[@]}" 2>&1
+    else
+        NSUnbufferedIO=YES xcodebuild archive \
+            "${COMMON_ARGS[@]}" \
+            "${UNIQUE_ARGS[@]}" 2>&1 | xcbeautify --is-ci
+    fi
 
 else
     echo "Error: Invalid mode '$MODE' specified. Use 'test' or 'archive'."

Scripts/build_libSession_util.sh

@@ -12,6 +12,7 @@ COMPILE_DIR="${TARGET_BUILD_DIR}/LibSessionUtil"
 INDEX_DIR="${DERIVED_DATA_PATH}/Index.noindex/Build/Products/Debug-${PLATFORM_NAME}"
 LAST_SUCCESSFUL_HASH_FILE="${TARGET_BUILD_DIR}/last_successful_source_tree.hash.log"
 LAST_BUILT_FRAMEWORK_SLICE_DIR_FILE="${TARGET_BUILD_DIR}/last_built_framework_slice_dir.log"
+TIMESTAMP_FILE="${TARGET_BUILD_DIR}/LibSessionUtil_BuildCache/libsession_util_built.timestamp"
 
 # Modify the platform detection to handle archive builds
 if [ "${ACTION}" = "install" ] || [ "${CONFIGURATION}" = "Release" ]; then
@@ -44,14 +45,14 @@ sync_headers() {
     for dest in "${destinations[@]}"; do
         if [ -n "$dest" ]; then
             local unique_id=$(uuidgen)
-            local temp_dest="${BUILD_DIR}/headers_staging_$(unique_id)"
+            local temp_dest="${BUILD_DIR}/headers_staging_${unique_id}"
             rm -rf "$temp_dest"
             mkdir -p "$temp_dest"
 
             rsync -rtc --delete --exclude='.DS_Store' "${source_dir}/" "$temp_dest/"
 
             # Atomically move the old directory out of the way
-            local old_dest="${BUILD_DIR}/headers_old_$(unique_id)"
+            local old_dest="${BUILD_DIR}/headers_old_${unique_id}"
             if [ -d "$dest" ]; then
                 mv "$dest" "$old_dest"
             fi
@@ -71,6 +72,27 @@ sync_headers() {
     done
 }
 
+# Robustly removes a directory, first clearing any immutable flags (work around Xcode's indexer file locking)
+remove_locked_dir() {
+  local dir_to_remove="$1"
+  if [ -d "${dir_to_remove}" ]; then
+    echo "- Unlocking and removing ${dir_to_remove}"
+    chflags -R nouchg "${dir_to_remove}" &>/dev/null || true
+    rm -rf "${dir_to_remove}"
+  fi
+}
+
+# Modify the platform detection to handle archive builds
+if [ "${ACTION}" = "install" ] || [ "${CONFIGURATION}" = "Release" ]; then
+  # Archive builds typically use 'install' action
+  if [ -z "$PLATFORM_NAME" ]; then
+    # During archive, PLATFORM_NAME might not be set correctly
+    # Default to device build for archives
+    PLATFORM_NAME="iphoneos"
+    echo "Missing 'PLATFORM_NAME' value, manually set to ${PLATFORM_NAME}"
+  fi
+fi
+
 # Determine whether we want to build from source
 TARGET_ARCH_DIR=""
 
@@ -86,7 +108,7 @@ fi
 if [ "${COMPILE_LIB_SESSION}" != "YES" ]; then
   echo "Using pre-packaged SessionUtil"
 
-    if [ "$CI" = "true" ] || [ "$DRONE" = "true" ]; then
+  if [ "$CI" = "true" ] || [ "$DRONE" = "true" ]; then
     # In CI, Xcode's SPM integration is reliable. Skip manual header sync
     # to avoid the 'redefinition of module' error.
     echo "- CI environment detected, skipping manual header sync to rely on SPM"
@@ -98,6 +120,10 @@ if [ "${COMPILE_LIB_SESSION}" != "YES" ]; then
   # Create the placeholder in the FINAL products directory to satisfy dependency
   touch "${BUILT_PRODUCTS_DIR}/libsession-util.a"
 
+  # Create the timestamp file to satisfy Xcode's output file requirement
+  mkdir -p "$(dirname "${TIMESTAMP_FILE}")"
+  echo "Using SPM pre-built version at $(date)" > "${TIMESTAMP_FILE}"
+  
   echo "- Revert to SPM complete."
   exit 0
 fi
@@ -186,6 +212,7 @@ else
 fi
 
 if [ "${REQUIRES_BUILD}" == 1 ]; then
+
   # Import settings from XCode (defaulting values if not present)
   VALID_SIM_ARCHS=(arm64 x86_64)
   VALID_DEVICE_ARCHS=(arm64)
@@ -272,6 +299,8 @@ if [ "${REQUIRES_BUILD}" == 1 ]; then
           -DBUILD_TESTS=OFF \
           -DBUILD_STATIC_DEPS=ON \
           -DENABLE_VISIBILITY=ON \
+          -DSROUTER_FULL=OFF \
+          -DSROUTER_DAEMON=OFF \
           -DSUBMODULE_CHECK=$submodule_check \
           -DCMAKE_BUILD_TYPE=$build_type \
           -DLOCAL_MIRROR=https://oxen.rocks/deps
@@ -332,7 +361,7 @@ if [ "${REQUIRES_BUILD}" == 1 ]; then
   echo "- Saving successful build cache files"
   echo "${TARGET_ARCH_DIR}" > "${LAST_BUILT_FRAMEWORK_SLICE_DIR_FILE}"
   echo "${CURRENT_SOURCE_TREE_HASH}" > "${LAST_SUCCESSFUL_HASH_FILE}"
-  
+
   echo "- Build complete"
 fi
 
@@ -351,5 +380,9 @@ fi
 sync_headers "${COMPILE_DIR}/Headers/"
 echo "- Sync complete."
 
+# Update the timestamp to indicate build completed
+mkdir -p "$(dirname "${TIMESTAMP_FILE}")"
+echo "Built from source at $(date)" > "${TIMESTAMP_FILE}"
+
 # Output to XCode just so the output is good
 echo "LibSession is Ready"

Scripts/clean_up_old_test_simulators.sh

@@ -15,7 +15,7 @@ yellow="\e[33;1m"
 blue="\e[34;1m"
 cyan="\e[36;1m"
 
-if ! echo "${DRONE_COMMIT_MESSAGE:-}" | grep -q -F "$TRIGGER_PHRASE"; then
+if ! echo "${DRONE_COMMIT_MESSAGE:-}" | grep -iq -F "$TRIGGER_PHRASE"; then
   echo -e "\n${green}Trigger phrase '$TRIGGER_PHRASE' not found in commit message. Skipping old simulator cleanup.${reset}"
   exit 0
 else

Scripts/reset_spm_cache.sh

@@ -4,7 +4,7 @@ set -e
 
 green="\e[32;1m"
 
-if echo "${DRONE_COMMIT_MESSAGE}" | grep -q -F "[Reset SPM]"; then
+if echo "${DRONE_COMMIT_MESSAGE}" | grep -iq -F "[Reset SPM]"; then
   echo "Trigger phrase found in commit message. Clearing SPM caches..."
 
   echo "--> Clearing global SwiftPM caches..."