fix(ci): replace Tuist install with brew and fix Metal duplicate build issue

hanrw · hanrw · commit ef89552346a3 · 2026-03-16T13:59:21.000+08:00
- Use brew to install Tuist in workflows for consistency
- Add script to remove duplicate Shaders.metal entry in SwiftTerm project
- Run fix script after project generation in CI workflows
- Replace tuist build/test with xcodebuild commands targeting Apple Silicon
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,16 +25,18 @@ jobs:
           swift-version: ${{ env.SWIFT_VERSION }}
 
       - name: Install Tuist
-        run: |
-          curl -Ls https://github.com/tuist/tuist/releases/download/4.130.2/tuist.zip -o /tmp/tuist.zip
-          unzip -o /tmp/tuist.zip -d /usr/local/bin/
-          tuist version
+        run: brew install --cask tuist
 
       - name: Install Dependencies
         run: tuist install
 
+      - name: Generate Project
+        run: |
+          tuist generate --no-open
+          ./scripts/fix-swiftterm-metal.sh
+
       - name: Build Debug
-        run: tuist build
+        run: xcodebuild build -scheme ClaudeBar -workspace ClaudeBar.xcworkspace -destination 'platform=macOS,arch=arm64'
 
       - name: Build Release
-        run: tuist build ClaudeBar -- -configuration Release
+        run: xcodebuild build -scheme ClaudeBar -workspace ClaudeBar.xcworkspace -destination 'platform=macOS,arch=arm64' -configuration Release
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,10 +48,7 @@ jobs:
           swift-version: ${{ env.SWIFT_VERSION }}
 
       - name: Install Tuist
-        run: |
-          curl -Ls https://github.com/tuist/tuist/releases/download/4.130.2/tuist.zip -o /tmp/tuist.zip
-          unzip -o /tmp/tuist.zip -d /usr/local/bin/
-          tuist version
+        run: brew install tuist
 
       - name: Cache Tuist
         uses: actions/cache@v4
@@ -107,6 +104,7 @@ jobs:
       - name: Generate Xcode Project
         run: |
           tuist generate --no-open
+          ./scripts/fix-swiftterm-metal.sh
           echo "=== Available schemes ==="
           xcodebuild -workspace ClaudeBar.xcworkspace -list
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,16 +20,25 @@ jobs:
         run: swift --version
 
       - name: Install Tuist
-        run: |
-          curl -Ls https://github.com/tuist/tuist/releases/download/4.130.2/tuist.zip -o /tmp/tuist.zip
-          unzip -o /tmp/tuist.zip -d /usr/local/bin/
-          tuist version
+        run: brew install --cask tuist
 
       - name: Install Dependencies
         run: tuist install
 
+      - name: Generate Project
+        run: |
+          tuist generate --no-open
+          ./scripts/fix-swiftterm-metal.sh
+
       - name: Run Tests with Coverage
-        run: tuist test --result-bundle-path TestResults.xcresult -- -enableCodeCoverage YES -skipMacroValidation
+        run: |
+          xcodebuild test \
+            -scheme ClaudeBar \
+            -workspace ClaudeBar.xcworkspace \
+            -destination 'platform=macOS,arch=arm64' \
+            -enableCodeCoverage YES \
+            -skipMacroValidation \
+            -resultBundlePath TestResults.xcresult
 
       - name: Generate Coverage Report
         run: |
diff --git a/scripts/fix-swiftterm-metal.sh b/scripts/fix-swiftterm-metal.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Workaround for tuist/tuist#9111: Tuist adds .metal files as both Sources and Resources,
+# causing "Unexpected duplicate tasks" build errors.
+# This removes the duplicate "Shaders.metal in Sources" entry, keeping only Resources.
+
+PBXPROJ="Tuist/.build/tuist-derived/SwiftTerm/SwiftTerm.xcodeproj/project.pbxproj"
+
+if [ ! -f "$PBXPROJ" ]; then
+  echo "SwiftTerm project not found, skipping"
+  exit 0
+fi
+
+if grep -q "Shaders.metal in Sources" "$PBXPROJ"; then
+  sed -i.bak '/Shaders\.metal in Sources/d' "$PBXPROJ"
+  rm -f "${PBXPROJ}.bak"
+  echo "Fixed: removed duplicate Shaders.metal from Sources build phase"
+else
+  echo "No duplicate Metal entry found, skipping"
+fi
