fix(ci): use .xlings.json for dependency management and dynamic package detection

Sunrisepeak · Sunrisepeak · commit 1d7f67ed5fd9 · 2026-05-12T17:39:02.000+08:00
- Add .xlings.json declaring xmake, gcc (linux), llvm (macos) as project deps
- Simplify setup-toolchain action: use curl instead of gh API (no token needed),
  then run `xlings install` to install all deps from .xlings.json
- Replace hardcoded package filters with dynamic git-diff-based detection
- When CI config changes, automatically build all test targets
- Consolidate per-package build steps into a single loop
diff --git a/.github/actions/setup-toolchain/action.yml b/.github/actions/setup-toolchain/action.yml
@@ -1,54 +1,50 @@
 name: Setup C++23 Toolchain
-description: Install xlings and C++23 toolchain for the current platform
+description: Install xlings and project dependencies declared in .xlings.json
 
 runs:
   using: composite
   steps:
-    - name: Setup (linux)
+    - name: Install xlings (linux)
       if: runner.os == 'Linux'
       shell: bash
       run: |
-        LATEST_VERSION=$(gh release view --repo d2learn/xlings --json tagName -q '.tagName')
+        LATEST_VERSION=$(curl -s https://api.github.com/repos/d2learn/xlings/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": *"\([^"]*\)".*/\1/')
         VERSION_NUM=${LATEST_VERSION#v}
         TARBALL="xlings-${VERSION_NUM}-linux-x86_64.tar.gz"
-        gh release download "$LATEST_VERSION" --repo d2learn/xlings --pattern "$TARBALL" --dir /tmp
+        curl -sL "https://github.com/d2learn/xlings/releases/download/${LATEST_VERSION}/${TARBALL}" -o "/tmp/${TARBALL}"
         mkdir -p "$HOME/.xlings"
-        tar -xzf "/tmp/$TARBALL" -C "$HOME/.xlings" --strip-components=1
+        tar -xzf "/tmp/${TARBALL}" -C "$HOME/.xlings" --strip-components=1
         "$HOME/.xlings/bin/xlings" self install
-      env:
-        GH_TOKEN: ${{ github.token }}
 
-    - name: Setup (macos)
+    - name: Install xlings (macos)
       if: runner.os == 'macOS'
       shell: bash
       run: |
-        LATEST_VERSION=$(gh release view --repo d2learn/xlings --json tagName -q '.tagName')
+        LATEST_VERSION=$(curl -s https://api.github.com/repos/d2learn/xlings/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": *"\([^"]*\)".*/\1/')
         VERSION_NUM=${LATEST_VERSION#v}
         ARCH=$(uname -m)
         TARBALL="xlings-${VERSION_NUM}-macosx-${ARCH}.tar.gz"
-        gh release download "$LATEST_VERSION" --repo d2learn/xlings --pattern "$TARBALL" --dir /tmp
+        curl -sL "https://github.com/d2learn/xlings/releases/download/${LATEST_VERSION}/${TARBALL}" -o "/tmp/${TARBALL}"
         mkdir -p "$HOME/.xlings"
-        tar -xzf "/tmp/$TARBALL" -C "$HOME/.xlings" --strip-components=1
+        tar -xzf "/tmp/${TARBALL}" -C "$HOME/.xlings" --strip-components=1
         xattr -dr com.apple.quarantine "$HOME/.xlings" 2>/dev/null || true
         "$HOME/.xlings/bin/xlings" self install
-      env:
-        GH_TOKEN: ${{ github.token }}
 
-    - name: Setup (windows)
+    - name: Install xlings (windows)
       if: runner.os == 'Windows'
       shell: pwsh
       run: irm https://raw.githubusercontent.com/d2learn/xlings/refs/heads/main/tools/other/quick_install.ps1 | iex
 
-    - name: Install toolchain (linux)
-      if: runner.os == 'Linux'
+    - name: Install dependencies (unix)
+      if: runner.os != 'Windows'
       shell: bash
       run: |
-        export PATH="$HOME/.xlings/subos/current/bin:$PATH"
-        xlings install gcc@15 -y
+        export PATH="$HOME/.xlings/bin:$HOME/.xlings/subos/current/bin:$PATH"
+        xlings install -y
 
-    - name: Install toolchain (macos)
-      if: runner.os == 'macOS'
-      shell: bash
+    - name: Install dependencies (windows)
+      if: runner.os == 'Windows'
+      shell: pwsh
       run: |
-        export PATH="$HOME/.xlings/subos/current/bin:$PATH"
-        xlings install llvm@20 -y
+        $env:PATH = "$env:USERPROFILE\.xlings\bin;$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
+        xlings install -y
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,13 +6,15 @@ on:
     paths:
       - 'packages/**'
       - 'tests/**'
-      - '.github/workflows/ci.yml'
+      - '.github/**'
+      - '.xlings.json'
   pull_request:
     branches: [main]
     paths:
       - 'packages/**'
       - 'tests/**'
-      - '.github/workflows/ci.yml'
+      - '.github/**'
+      - '.xlings.json'
 
 env:
   XLINGS_NON_INTERACTIVE: 1
@@ -21,46 +23,56 @@ jobs:
   detect-changes:
     runs-on: ubuntu-24.04
     outputs:
-      templates: ${{ steps.filter.outputs.templates }}
-      cmdline: ${{ steps.filter.outputs.cmdline }}
-      llmapi: ${{ steps.filter.outputs.llmapi }}
-      lua: ${{ steps.filter.outputs.lua }}
-      xpkg: ${{ steps.filter.outputs.xpkg }}
+      packages: ${{ steps.detect.outputs.packages }}
+      build_all: ${{ steps.detect.outputs.build_all }}
     steps:
       - uses: actions/checkout@v4
-      - uses: dorny/paths-filter@v3
-        id: filter
         with:
-          filters: |
-            templates:
-              - 'packages/t/templates/**'
-              - 'tests/t/templates/**'
-              - '.github/workflows/ci.yml'
-            cmdline:
-              - 'packages/c/cmdline/**'
-              - 'tests/c/cmdline/**'
-              - '.github/workflows/ci.yml'
-            llmapi:
-              - 'packages/l/llmapi/**'
-              - 'tests/l/llmapi/**'
-              - '.github/workflows/ci.yml'
-            lua:
-              - 'packages/m/mcpplibs-capi-lua/**'
-              - 'tests/l/lua/**'
-              - '.github/workflows/ci.yml'
-            xpkg:
-              - 'packages/m/mcpplibs-xpkg/**'
-              - 'tests/m/mcpplibs-xpkg/**'
-              - '.github/workflows/ci.yml'
+          fetch-depth: 0
+
+      - name: Detect changed packages
+        id: detect
+        run: |
+          # Determine the base ref for comparison
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            BASE="${{ github.event.pull_request.base.sha }}"
+          else
+            BASE="${{ github.event.before }}"
+          fi
+
+          # Check if CI config itself changed — if so, build all
+          CI_CHANGED=$(git diff --name-only "$BASE" HEAD -- .github/ .xlings.json || true)
+          if [ -n "$CI_CHANGED" ]; then
+            echo "build_all=true" >> "$GITHUB_OUTPUT"
+            echo "CI config changed, will build all packages"
+          else
+            echo "build_all=false" >> "$GITHUB_OUTPUT"
+          fi
+
+          # Collect changed package names from packages/ and tests/ directories
+          CHANGED_DIRS=$(git diff --name-only "$BASE" HEAD -- packages/ tests/ | \
+            sed -n 's|^packages/./\([^/]*\)/.*|\1|p; s|^tests/./\([^/]*\)/.*|\1|p' | \
+            sort -u)
+
+          # Build JSON array of changed packages
+          JSON="["
+          FIRST=true
+          for pkg in $CHANGED_DIRS; do
+            if [ "$FIRST" = true ]; then
+              FIRST=false
+            else
+              JSON="$JSON,"
+            fi
+            JSON="$JSON\"$pkg\""
+          done
+          JSON="$JSON]"
+
+          echo "packages=$JSON" >> "$GITHUB_OUTPUT"
+          echo "Changed packages: $JSON"
 
   build:
     needs: detect-changes
-    if: >-
-      needs.detect-changes.outputs.templates == 'true' ||
-      needs.detect-changes.outputs.cmdline == 'true' ||
-      needs.detect-changes.outputs.llmapi == 'true' ||
-      needs.detect-changes.outputs.lua == 'true' ||
-      needs.detect-changes.outputs.xpkg == 'true'
+    if: needs.detect-changes.outputs.build_all == 'true' || needs.detect-changes.outputs.packages != '[]'
     strategy:
       fail-fast: false
       matrix:
@@ -78,97 +90,116 @@ jobs:
         if: runner.os == 'Linux'
         working-directory: tests
         run: |
-          export PATH="$HOME/.xlings/subos/current/bin:$PATH"
+          export PATH="$HOME/.xlings/bin:$HOME/.xlings/subos/current/bin:$PATH"
           xmake f -P . -y
 
       - name: Configure (macos)
         if: runner.os == 'macOS'
         working-directory: tests
         run: |
-          export PATH="$HOME/.xlings/subos/current/bin:$PATH"
+          export PATH="$HOME/.xlings/bin:$HOME/.xlings/subos/current/bin:$PATH"
           xmake f -P . -y --toolchain=llvm
 
       - name: Configure (windows)
         if: runner.os == 'Windows'
         working-directory: tests
         run: |
-          $env:PATH = "$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
+          $env:PATH = "$env:USERPROFILE\.xlings\bin;$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
           xmake f -P . -y
 
-      # templates
-      - name: templates (unix)
-        if: runner.os != 'Windows' && needs.detect-changes.outputs.templates == 'true'
-        working-directory: tests
-        run: |
-          export PATH="$HOME/.xlings/subos/current/bin:$PATH"
-          xmake build -P . -y templates_test
-          xmake run -P . templates_test
-      - name: templates (windows)
-        if: runner.os == 'Windows' && needs.detect-changes.outputs.templates == 'true'
+      - name: Build and test (unix)
+        if: runner.os != 'Windows'
         working-directory: tests
+        env:
+          BUILD_ALL: ${{ needs.detect-changes.outputs.build_all }}
+          CHANGED_PACKAGES: ${{ needs.detect-changes.outputs.packages }}
         run: |
-          $env:PATH = "$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
-          xmake build -P . -y templates_test
-          xmake run -P . templates_test
+          export PATH="$HOME/.xlings/bin:$HOME/.xlings/subos/current/bin:$PATH"
 
-      # cmdline
-      - name: cmdline (unix)
-        if: runner.os != 'Windows' && needs.detect-changes.outputs.cmdline == 'true'
-        working-directory: tests
-        run: |
-          export PATH="$HOME/.xlings/subos/current/bin:$PATH"
-          xmake build -P . -y cmdline_test
-          xmake run -P . cmdline_test test_input
-      - name: cmdline (windows)
-        if: runner.os == 'Windows' && needs.detect-changes.outputs.cmdline == 'true'
-        working-directory: tests
-        run: |
-          $env:PATH = "$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
-          xmake build -P . -y cmdline_test
-          xmake run -P . cmdline_test test_input
+          # Collect test targets to build
+          TARGETS=""
+          if [ "$BUILD_ALL" = "true" ]; then
+            # Find all test targets from test xmake.lua files
+            TARGETS=$(grep -r 'target("' */*/xmake.lua 2>/dev/null | sed 's/.*target("\([^"]*\)").*/\1/' | sort -u)
+            echo "Building ALL targets: $TARGETS"
+          else
+            # Build only changed packages
+            for pkg in $(echo "$CHANGED_PACKAGES" | tr -d '[]"' | tr ',' ' '); do
+              TARGET="${pkg}_test"
+              # Verify the target exists
+              if grep -rq "target(\"$TARGET\")" */*/xmake.lua 2>/dev/null; then
+                TARGETS="$TARGETS $TARGET"
+              else
+                echo "Warning: no test target '$TARGET' found for package '$pkg', skipping"
+              fi
+            done
+            echo "Building changed targets: $TARGETS"
+          fi
 
-      # llmapi (build only, needs API key to run)
-      - name: llmapi (unix)
-        if: runner.os != 'Windows' && needs.detect-changes.outputs.llmapi == 'true'
-        working-directory: tests
-        run: |
-          export PATH="$HOME/.xlings/subos/current/bin:$PATH"
-          xmake build -P . -y llmapi_test
-      - name: llmapi (windows)
-        if: runner.os == 'Windows' && needs.detect-changes.outputs.llmapi == 'true'
-        working-directory: tests
-        run: |
-          $env:PATH = "$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
-          xmake build -P . -y llmapi_test
+          # Build and run each target
+          for target in $TARGETS; do
+            echo "=== Building $target ==="
+            xmake build -P . -y "$target"
 
-      # lua
-      - name: lua (unix)
-        if: runner.os != 'Windows' && needs.detect-changes.outputs.lua == 'true'
-        working-directory: tests
-        run: |
-          export PATH="$HOME/.xlings/subos/current/bin:$PATH"
-          xmake build -P . -y lua_test
-          xmake run -P . lua_test
-      - name: lua (windows)
-        if: runner.os == 'Windows' && needs.detect-changes.outputs.lua == 'true'
-        working-directory: tests
-        run: |
-          $env:PATH = "$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
-          xmake build -P . -y lua_test
-          xmake run -P . lua_test
+            # llmapi requires API key, only build don't run
+            if [ "$target" = "llmapi_test" ]; then
+              echo "Skipping run for $target (requires API key)"
+              continue
+            fi
 
-      # mcpplibs-xpkg
-      - name: mcpplibs-xpkg (unix)
-        if: runner.os != 'Windows' && needs.detect-changes.outputs.xpkg == 'true'
-        working-directory: tests
-        run: |
-          export PATH="$HOME/.xlings/subos/current/bin:$PATH"
-          xmake build -P . -y mcpplibs-xpkg_test
-          xmake run -P . mcpplibs-xpkg_test
-      - name: mcpplibs-xpkg (windows)
-        if: runner.os == 'Windows' && needs.detect-changes.outputs.xpkg == 'true'
+            echo "=== Running $target ==="
+            if [ "$target" = "cmdline_test" ]; then
+              xmake run -P . "$target" test_input
+            else
+              xmake run -P . "$target"
+            fi
+          done
+
+      - name: Build and test (windows)
+        if: runner.os == 'Windows'
         working-directory: tests
+        env:
+          BUILD_ALL: ${{ needs.detect-changes.outputs.build_all }}
+          CHANGED_PACKAGES: ${{ needs.detect-changes.outputs.packages }}
         run: |
-          $env:PATH = "$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
-          xmake build -P . -y mcpplibs-xpkg_test
-          xmake run -P . mcpplibs-xpkg_test
+          $env:PATH = "$env:USERPROFILE\.xlings\bin;$env:USERPROFILE\.xlings\subos\current\bin;$env:PATH"
+
+          # Collect test targets
+          $targets = @()
+          if ($env:BUILD_ALL -eq "true") {
+            $targets = Get-ChildItem -Recurse -Filter "xmake.lua" -Path "*/*" |
+              Select-String 'target\("([^"]+)"\)' |
+              ForEach-Object { $_.Matches[0].Groups[1].Value } |
+              Sort-Object -Unique
+            Write-Host "Building ALL targets: $($targets -join ', ')"
+          } else {
+            $packages = $env:CHANGED_PACKAGES | ConvertFrom-Json
+            foreach ($pkg in $packages) {
+              $target = "${pkg}_test"
+              $found = Get-ChildItem -Recurse -Filter "xmake.lua" -Path "*/*" |
+                Select-String "target\(`"$target`"\)" -Quiet
+              if ($found) {
+                $targets += $target
+              } else {
+                Write-Host "Warning: no test target '$target' found for package '$pkg', skipping"
+              }
+            }
+            Write-Host "Building changed targets: $($targets -join ', ')"
+          }
+
+          foreach ($target in $targets) {
+            Write-Host "=== Building $target ==="
+            xmake build -P . -y $target
+
+            if ($target -eq "llmapi_test") {
+              Write-Host "Skipping run for $target (requires API key)"
+              continue
+            }
+
+            Write-Host "=== Running $target ==="
+            if ($target -eq "cmdline_test") {
+              xmake run -P . $target test_input
+            } else {
+              xmake run -P . $target
+            }
+          }
diff --git a/.xlings.json b/.xlings.json
@@ -0,0 +1,7 @@
+{
+  "workspace": {
+    "xmake": "3.0.7",
+    "gcc": { "linux": "15.1.0" },
+    "llvm": { "macosx": "20.1.7" }
+  }
+}
