Development

.github/workflows/swift.yml

@@ -21,32 +21,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint:
-    runs-on: macos-26
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: swiftformat --lint
-        run: |
-          swiftformat --lint --config .swiftformat .
   build:
     runs-on: macos-26
 
     steps:
     - uses: actions/checkout@v6
 
-    - name: Check Cocoapod Version
-      run: pod --version
-
-    - name: Check Cocoapod Path
-      run: which pod
-
-    - name: Update Cocoapod Repo
-      run: pod repo update
-
-    # - name: Get Pod Spec
-    #   run: pod spec cat --regex Bagel --version=1.4.0
-
     - name: Check Xcode Version
       run: |
         xcodebuild -version
@@ -99,13 +79,23 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Bazel iOS Cache
+      # Every `bazel` in this job reads these: the disk cache holds what the
+      # build produced, the repository cache what it downloaded. Without the
+      # second one a runner fetches rules_apple and the rest again every time.
+      - name: Bazel Cache
         uses: actions/cache@v5
         with:
-          path: fixture/iOS/cache
-          key: ${{ runner.os }}-IntegrateIOS-fixture-ios-${{ hashFiles('**/fixture/iOS/WORKSPACE') }}
+          path: |
+            ~/bazel-disk
+            ~/bazel-repo
+          key: ${{ runner.os }}-bazel-IntegrateIOS-${{ github.run_id }}
           restore-keys: |
-            ${{ runner.os }}-IntegrateIOS-fixture-ios-
+            ${{ runner.os }}-bazel-IntegrateIOS-
+
+      - name: Bazel Cache Settings
+        run: |
+          echo "build --disk_cache=$HOME/bazel-disk" >> ~/.bazelrc
+          echo "build --repository_cache=$HOME/bazel-repo" >> ~/.bazelrc
 
       - name: Download Bazelize
         uses: actions/download-artifact@v8
@@ -118,35 +108,262 @@ jobs:
           pwd
           chmod +x bazelize
 
+      # A plugin that did not run leaves the target missing the sources it
+      # generates, and the compile error that follows names those sources rather
+      # than the plugin. The run says so; the lane stops there.
       - name: Bazel Generation
         working-directory: fixture/iOS
         run: |
-          ../../bazelize --project Example.xcodeproj
-
-      - name: Update SPM Deps
-        working-directory: fixture/iOS
-        run: |
-          bazel mod tidy
+          ../../bazelize --project Example.xcodeproj --output App | tee bazelize.log
+          ! grep -q "did not run the" bazelize.log
 
       - name: Build Application
-        working-directory: fixture/iOS
+        working-directory: fixture/iOS/App
         run: |
-          bazel build Example
-      
+          bazel build //Targets/Example
+
       - name: Copy IPA
-        working-directory: fixture/iOS
+        working-directory: fixture/iOS/App
+        run: |
+          cp "$(bazel cquery //Targets/Example --output=files | grep '\.ipa$')" ../Example.ipa
+
+      # A simulator test on a runner pays for booting the simulator, and four of
+      # them booting at once pay for it four times over: the first test took
+      # 247s here and the last timed out at 302s having never started. One
+      # simulator is booted up front, outside any test's clock, and the tests
+      # run one at a time so they share it.
+      #
+      # Which simulator is the runner's business, not ours: it has whatever
+      # runtime its Xcode ships, which is not the one this repository is
+      # developed against.
+      - name: Boot Simulator
         run: |
-          cp bazel-bin/Example/Example.ipa .
+          # A device name has spaces in it, so one field per line.
+          { read -r device; read -r version; read -r udid; } < <(python3 - <<'PY'
+          import json, subprocess
+
+          def simctl(*arguments):
+              listed = subprocess.run(["xcrun", "simctl", "list", "-j", *arguments], capture_output=True, text=True)
+              return json.loads(listed.stdout)
+
+          runtimes = [runtime for runtime in simctl("runtimes")["runtimes"]
+                      if runtime["identifier"].startswith("com.apple.CoreSimulator.SimRuntime.iOS")
+                      and runtime.get("isAvailable")]
+          runtimes.sort(key=lambda runtime: [int(part) for part in runtime["version"].split(".")])
+          runtime = runtimes[-1]
+
+          devices = [device for device in simctl("devices", "available")["devices"].get(runtime["identifier"], [])
+                     if device["name"].startswith("iPhone")]
+          if devices:
+              name, udid = devices[-1]["name"], devices[-1]["udid"]
+          else:
+              kinds = [kind for kind in simctl("devicetypes")["devicetypes"] if kind["name"].startswith("iPhone")]
+              name = kinds[-1]["name"]
+              created = subprocess.run(
+                  ["xcrun", "simctl", "create", name, kinds[-1]["identifier"], runtime["identifier"]],
+                  capture_output=True, text=True)
+              udid = created.stdout.strip()
+
+          print(name)
+          print(runtime["version"])
+          print(udid)
+          PY
+          )
+          echo "Simulator: $device, iOS $version ($udid)"
+          echo "SIMULATOR_DEVICE=$device" >> "${GITHUB_ENV:-/dev/null}"
+          echo "SIMULATOR_VERSION=$version" >> "${GITHUB_ENV:-/dev/null}"
+          xcrun simctl boot "$udid" || true
+          xcrun simctl bootstatus "$udid"
 
       - name: Unit Test
-        working-directory: fixture/iOS
+        working-directory: fixture/iOS/App
         run: |
-          bazel test ExampleTests Framework1Tests Framework2Tests Framework3Tests
+          bazel test \
+            --@build_bazel_rules_apple//apple/build_settings:ios_simulator_device="$SIMULATOR_DEVICE" \
+            --@build_bazel_rules_apple//apple/build_settings:ios_simulator_version="$SIMULATOR_VERSION" \
+            --local_test_jobs=1 \
+            --test_timeout=900 \
+            --test_output=errors \
+            //Targets/ExampleTests \
+            //Targets/Framework1Tests \
+            //Targets/Framework2Tests \
+            //Targets/Framework3Tests
 
       - name: Upload iOS Artifact
         uses: actions/upload-artifact@v7
         with:
           name: iOS_Example.ipa
           path: fixture/iOS/Example.ipa
-          if-no-files-found: ignore # 'warn' or 'ignore' 
-
+          if-no-files-found: ignore # 'warn' or 'ignore'
+
+  # The corpus is not in this repository: `app/` and `spm/` are ignored, so each
+  # lane clones what it measures at the revision it was measured against.
+  IntegrateApp:
+    runs-on: macos-26
+    needs: [artifact]
+    timeout-minutes: 120
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: stats
+            repo: https://github.com/exelban/stats
+            rev: b4251e2ba05511de6b51b296d7b9e98a9c6545f5
+            project: Stats.xcodeproj
+            target: //Targets/Stats
+          - name: MonitorControl
+            repo: https://github.com/MonitorControl/MonitorControl
+            rev: 71b8c5ae51955d17b05688371ea7b899b684bdbd
+            project: MonitorControl.xcodeproj
+            target: //Targets/MonitorControl
+          - name: SwiftBar
+            repo: https://github.com/swiftbar/SwiftBar
+            rev: 05cb6cb1123bc7227ee2b39f390f8bccb839fed0
+            project: SwiftBar.xcodeproj
+            target: //Targets/SwiftBar
+          - name: Rectangle
+            repo: https://github.com/rxhanson/Rectangle
+            rev: b4c9c47c00b4df9cbfb3489dc5eae2f1249ad24a
+            project: Rectangle.xcodeproj
+            target: //...
+          - name: VirtualBuddy
+            repo: https://github.com/insidegui/VirtualBuddy
+            rev: 088351b0fc67e0b24b83e7954ad48314dda4ce04
+            project: VirtualBuddy.xcodeproj
+            target: //Targets/VirtualBuddy
+          # Not yet green on a runner, so not yet a lane. iina is the app the
+          # notes still list an open problem for, and MacPass needs its
+          # submodules and a Carthage bootstrap that nothing here has proven.
+          # - name: iina
+          #   repo: https://github.com/iina/iina
+          #   rev: c111221ea027466b79b40bfca054772d4851e06f
+          #   project: iina.xcodeproj
+          #   target: //Targets/iina
+          # - name: MacPass
+          #   repo: https://github.com/MacPass/MacPass
+          #   rev: 3256bc93ea94eb20b618c155e6a1b08e6fabe663
+          #   project: MacPass.xcodeproj
+          #   target: //Targets/MacPass
+          #   submodules: true
+          #   setup: carthage bootstrap --platform macOS --cache-builds
+    steps:
+      # The disk cache holds what a build produced, the repository cache what it
+      # downloaded, and `.build` what SwiftPM resolved for the app's packages:
+      # generation resolves that graph before a single rule is written.
+      - name: Bazel Cache
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/bazel-disk
+            ~/bazel-repo
+          key: ${{ runner.os }}-bazel-${{ matrix.name }}-${{ matrix.rev }}-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-bazel-${{ matrix.name }}-${{ matrix.rev }}-
+            ${{ runner.os }}-bazel-${{ matrix.name }}-
+
+      - name: Bazel Cache Settings
+        run: |
+          echo "build --disk_cache=$HOME/bazel-disk" >> ~/.bazelrc
+          echo "build --repository_cache=$HOME/bazel-repo" >> ~/.bazelrc
+
+      - name: Download Bazelize
+        uses: actions/download-artifact@v8
+        with:
+          name: bazelize
+
+      - name: Clone ${{ matrix.name }}
+        run: |
+          chmod +x bazelize
+          git clone --filter=blob:none "${{ matrix.repo }}" "${{ matrix.name }}"
+          git -C "${{ matrix.name }}" checkout --detach "${{ matrix.rev }}"
+
+      # After the clone: a restored cache would otherwise create the directory
+      # `git clone` insists on creating itself.
+      - name: SwiftPM Cache
+        uses: actions/cache@v5
+        with:
+          path: ${{ matrix.name }}/App/.build
+          key: ${{ runner.os }}-spm-${{ matrix.name }}-${{ matrix.rev }}
+          restore-keys: |
+            ${{ runner.os }}-spm-${{ matrix.name }}-
+
+      - name: Check out submodules
+        if: matrix.submodules
+        working-directory: ${{ matrix.name }}
+        run: git submodule update --init --recursive
+
+      - name: Set up ${{ matrix.name }}
+        if: matrix.setup
+        working-directory: ${{ matrix.name }}
+        run: ${{ matrix.setup }}
+
+      - name: Bazel Generation
+        run: |
+          ./bazelize --project "${{ matrix.name }}/${{ matrix.project }}" --output "${{ matrix.name }}/App" | tee bazelize.log
+          ! grep -q "did not run the" bazelize.log
+
+      - name: Build Application
+        working-directory: ${{ matrix.name }}/App
+        run: bazel build ${{ matrix.target }}
+
+  # A package whose tests only compile through a source its own build tool
+  # plugin generates. The plugin and its tool are built by Bazel, so this
+  # holds on a toolchain that cannot load the package with SwiftPM at all.
+  IntegratePackage:
+    runs-on: macos-26
+    needs: [artifact]
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: TbCodeGenerater
+            repo: https://github.com/yume190/TbCodeGenerater
+            rev: b7071d5e67189f48d5d71e06225dd1cb02470995
+            target: //Packages/TbCodeGenerater/...
+    steps:
+      - name: Bazel Cache
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/bazel-disk
+            ~/bazel-repo
+          key: ${{ runner.os }}-bazel-${{ matrix.name }}-${{ matrix.rev }}-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-bazel-${{ matrix.name }}-${{ matrix.rev }}-
+            ${{ runner.os }}-bazel-${{ matrix.name }}-
+
+      - name: Bazel Cache Settings
+        run: |
+          echo "build --disk_cache=$HOME/bazel-disk" >> ~/.bazelrc
+          echo "build --repository_cache=$HOME/bazel-repo" >> ~/.bazelrc
+
+      - name: Download Bazelize
+        uses: actions/download-artifact@v8
+        with:
+          name: bazelize
+
+      - name: Clone ${{ matrix.name }}
+        run: |
+          chmod +x bazelize
+          git clone --filter=blob:none "${{ matrix.repo }}" "${{ matrix.name }}"
+          git -C "${{ matrix.name }}" checkout --detach "${{ matrix.rev }}"
+
+      # The package's directory name is the directory its rules live under, so
+      # the clone is named after the package rather than after the lane.
+      # Generation runs the plugins with what it has, which on this toolchain is
+      # not enough to build the plugin's tool — `//:plugins` is what builds the
+      # plugin and the tool with Bazel and runs them, so that is what the lane
+      # checks. Nothing else is regenerated: the rules glob the directory.
+      - name: Bazel Generation
+        run: ./bazelize --project "${{ matrix.name }}" --output "${{ matrix.name }}/App"
+
+      - name: Run Plugins
+        working-directory: ${{ matrix.name }}/App
+        run: |
+          PATH="$GITHUB_WORKSPACE:$PATH" bazel run //:plugins
+
+      - name: Test Package
+        working-directory: ${{ matrix.name }}/App
+        run: bazel test ${{ matrix.target }}
+

.gitignore

@@ -183,4 +183,13 @@ cache/
 
 .codex-local-skills/
 .vendor/
-app/
+app/
+spm/
+Generated/
+
+# bazelize output inside the iOS fixture: one directory, the one `make bazelize`
+# writes
+fixture/iOS/App/
+
+# running a local package's build tool plugins resolves that package
+fixture/iOS/Local1/Package.resolved

Makefile

@@ -30,30 +30,16 @@ build: format
 
 .PHONY: test
 test:
-	swift test -v --skip CocoapodTests 2>&1 | xcpretty
-#	COCOAPOD=$(shell which pod) swift test -v 2>&1 | xcbeautify
-
-Apple     := bazelbuild/rules_apple
-Swift     := bazelbuild/rules_swift
-XCodeProj := buildbuddy-io/rules_xcodeproj
-REPOS     := Apple Swift XCodeProj 
-
-SPM	     := cgrindel/rules_swift_package_manager
-REPO_SPM := SPM
-
-
-# user/repo rule_name output_file_path
-# python3 git_release.py bazelbuild/rules_apple Apple Sources/BazelizeKit/Rule/Rule+Apple.swift
-$(REPOS):
-	python3 git_release.py $($@) $@ Sources/BazelizeKit/Repo/Repo+$@.swift 5 normal
-
-$(REPO_SPM):
-	python3 git_release.py $($@) $@ Sources/BazelizeKit/Repo/Repo+$@.swift 5 archive
-
-rules: $(REPOS)
-
-spm: $(REPO_SPM)
+	swift test -v 2>&1 | xcpretty
 
 .PHONY: bazelize
 bazelize: install
 	cd fixture/iOS && make bazelize
+
+.PHONY: update-repo-enums
+update-repo-enums:
+	swift package plugin --allow-network-connections all --allow-writing-to-package-directory repo-enum
+
+.PHONY: replace
+replace: update-repo-enums
+	cp Generated/*.swift Sources/BazelizeKit/BazelDep/