v1.2.0

.github/workflows/build-ipa.yml

@@ -63,11 +63,12 @@ jobs:
         run: |
           brew tap FelixHerrmann/tap
           brew trust FelixHerrmann/tap
-          brew install xcodegen swiftgen swift-package-list
+          brew install make xcodegen swiftgen swift-package-list
+          echo "$(brew --prefix make)/libexec/gnubin" >> "$GITHUB_PATH"
 
       - name: Generate Xcode project
         if: steps.version_check.outputs.should_build == 'true' || github.event_name == 'workflow_dispatch'
-        run: xcodegen generate
+        run: make generate
 
       - name: Update acknowledgements
         if: steps.version_check.outputs.should_build == 'true' || github.event_name == 'workflow_dispatch'

.github/workflows/lint.yml

@@ -0,0 +1,59 @@
+name: Lint
+
+on:
+  pull_request:
+    branches:
+      - main
+      - dev
+
+  push:
+    branches:
+      - main
+      - dev
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  linting:
+    name: Formatting and Linting
+    runs-on: macos-26
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: command -v swiftlint >/dev/null 2>&1 || brew install swiftlint
+
+      - name: Lint
+        run: swiftlint lint --strict
+
+      - name: Format
+        run: swiftformat --lint --strict .
+
+  codegen:
+    name: Code Generation Checks
+    runs-on: macos-26
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: command -v swiftgen >/dev/null 2>&1 || brew install swiftgen
+
+      - name: Regenerate
+        run: swiftgen config run --config swiftgen.yml
+
+      - name: Verify no changes
+        run: |
+          if ! git diff --exit-code; then
+            echo "::error::Generated files are out of date. Run 'swiftgen config run --config swiftgen.yml' and commit the result."
+            exit 1
+          fi

.github/workflows/test.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - dev
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -13,9 +14,8 @@ concurrency:
 jobs:
   spm-tests:
     name: SPM Package Tests
-    # Temporarily disabled
-    if: false
     runs-on: macos-26
+    timeout-minutes: 25
 
     steps:
       - name: Checkout
@@ -24,14 +24,85 @@ jobs:
           submodules: recursive
 
       - name: Test MeshCore
-        run: swift test --package-path MeshCore
+        run: |
+          run_tests() {
+            rm -f "$RUNNER_TEMP/watchdog-fired"
+            swift test --package-path MeshCore --no-parallel &
+            TEST_PID=$!
+            (
+              sleep 480
+              touch "$RUNNER_TEMP/watchdog-fired"
+              echo "::warning::swift test still running after 8 minutes - sampling process tree"
+              for pid in $(pgrep -f "MeshCorePackageTests|swiftpm-testing-helper|swift-test" || true); do
+                echo "=== sample of PID $pid ==="
+                sample "$pid" 5 2>/dev/null || true
+              done
+              kill -9 $TEST_PID 2>/dev/null || true
+            ) &
+            WATCHDOG=$!
+            if wait $TEST_PID; then
+              kill $WATCHDOG 2>/dev/null || true
+              return 0
+            else
+              STATUS=$?
+              kill $WATCHDOG 2>/dev/null || true
+              return $STATUS
+            fi
+          }
+          STATUS=0
+          run_tests || STATUS=$?
+          if [ "$STATUS" -eq 0 ]; then
+            exit 0
+          fi
+          if [ -f "$RUNNER_TEMP/watchdog-fired" ]; then
+            echo "::warning::first attempt hung - retrying once"
+            run_tests
+          else
+            exit "$STATUS"
+          fi
 
       - name: Test MC1Services
-        run: swift test --package-path MC1Services
+        run: |
+          run_tests() {
+            rm -f "$RUNNER_TEMP/watchdog-fired"
+            swift test --package-path MC1Services --no-parallel &
+            TEST_PID=$!
+            (
+              sleep 480
+              touch "$RUNNER_TEMP/watchdog-fired"
+              echo "::warning::swift test still running after 8 minutes - sampling process tree"
+              for pid in $(pgrep -f "MC1ServicesPackageTests|swiftpm-testing-helper|swift-test" || true); do
+                echo "=== sample of PID $pid ==="
+                sample "$pid" 5 2>/dev/null || true
+              done
+              kill -9 $TEST_PID 2>/dev/null || true
+            ) &
+            WATCHDOG=$!
+            if wait $TEST_PID; then
+              kill $WATCHDOG 2>/dev/null || true
+              return 0
+            else
+              STATUS=$?
+              kill $WATCHDOG 2>/dev/null || true
+              return $STATUS
+            fi
+          }
+          STATUS=0
+          run_tests || STATUS=$?
+          if [ "$STATUS" -eq 0 ]; then
+            exit 0
+          fi
+          if [ -f "$RUNNER_TEMP/watchdog-fired" ]; then
+            echo "::warning::first attempt hung - retrying once"
+            run_tests
+          else
+            exit "$STATUS"
+          fi
 
   xcode-build:
     name: Xcode Build
     runs-on: macos-26
+    timeout-minutes: 15
 
     steps:
       - name: Checkout
@@ -41,11 +112,13 @@ jobs:
 
       - name: Install dependencies
         run: |
+          brew install make
+          echo "$(brew --prefix make)/libexec/gnubin" >> "$GITHUB_PATH"
           command -v xcodegen >/dev/null 2>&1 || brew install xcodegen
           command -v swiftgen >/dev/null 2>&1 || brew install swiftgen
 
       - name: Generate Xcode project
-        run: xcodegen generate
+        run: make generate
 
       - name: Cache Xcode build
         uses: irgaly/xcode-cache@v1

.github/workflows/testflight.yml

@@ -31,8 +31,9 @@ jobs:
         run: |
           brew tap FelixHerrmann/tap
           brew trust FelixHerrmann/tap
-          brew install xcodegen swiftgen swift-package-list
-          gem install fastlane -v 2.236.1
+          brew install make xcodegen swiftgen swift-package-list
+          echo "$(brew --prefix make)/libexec/gnubin" >> "$GITHUB_PATH"
+          gem install fastlane -v 2.237.0
 
       - name: Setup SSH for Match
         uses: webfactory/ssh-agent@v0.10.0

.gitignore

@@ -30,6 +30,7 @@ xcuserdata/
 
 ## Xcodegen
 *.xcodeproj
+dev.yml
 
 ## Obj-C/Swift specific
 *.hmap

.swiftformat

@@ -0,0 +1,52 @@
+# SwiftFormat configuration — mirrors the conventions already in the codebase.
+# Run: swiftformat .    (lint-only: swiftformat --lint .)
+
+--swiftversion 6.2
+
+# Match .swiftlint.yml exclusions
+--exclude .build,.worktrees,build,tmp,MC1.xcodeproj,MC1/Resources/Generated,MeshCore/.build,MeshCore-references,MC1Services/.build,fastlane,scripts
+
+# Indentation — 2 spaces, no tabs
+--indent 2
+--tabwidth 2
+--smarttabs enabled
+--indentcase false          # switch cases align with switch (switch_case_alignment disabled in SwiftLint)
+
+# Line width — aligned with SwiftLint line_length warning
+--maxwidth 250
+
+# Imports — alphabetized within a single group
+--importgrouping alpha
+
+# Self — codebase omits redundant self; keep only where required
+--self remove
+
+# Braces / control flow — K&R, else & catch on the same line as the brace
+--allman false
+--elseposition same-line
+--guardelse auto
+
+# Wrapping — preserve author's line breaks; only balance the closing paren
+--wraparguments preserve
+--wrapparameters preserve
+--wrapcollections preserve
+--wrapconditions preserve
+--closingparen balanced
+
+# Spacing / misc conventions observed in the code
+--voidtype void
+--stripunusedargs closure-only
+--commas inline            # no trailing commas (trailing_comma disabled in SwiftLint)
+--emptybraces no-space
+--ranges no-space
+--operatorfunc spaced
+--nospaceoperators ..<,...
+
+# Rules that would introduce churn against the existing style
+--disable markTypes        # code does not MARK every type declaration
+--disable trailingCommas   # matches SwiftLint disabling trailing_comma
+--disable wrapMultilineStatementBraces
+--disable redundantSelf    # bugged: https://github.com/nicklockwood/SwiftFormat/issues/1732
+
+# Leave file headers untouched
+--header ignore

CONTRIBUTING.md

@@ -102,7 +102,7 @@ It's usually easier to simply create a feature request GitHub issue with your id
 1. **Clone the repository**.
 2. **Generate the Xcode project**:
    ```bash
-   xcodegen generate
+   make generate # creates a gitignored dev.yml; set your Apple team ID there for local signing
    ```
    The project is generated by XcodeGen from `project.yml`; never edit `MC1.xcodeproj` directly, as it is overwritten on the next generate. Make project configuration changes in `project.yml`.
 3. **Open `MC1.xcodeproj`**.