From 1d9a214fd627aa6699f0c33d17da6892aac1bcaf Mon Sep 17 00:00:00 2001
From: EricX-Zhao <ericzhao0325@163.com>
Date: Mon, 22 Jun 2026 14:57:35 +0300
Subject: [PATCH] Move cross_compile workflow to repo root and support manual
 dispatch

---
 .../.github => .github}/workflows/build-images.yaml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename {cross_compile/.github => .github}/workflows/build-images.yaml (88%)

diff --git a/cross_compile/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
similarity index 88%
rename from cross_compile/.github/workflows/build-images.yaml
rename to .github/workflows/build-images.yaml
index 74828df..cbc12e5 100644
--- a/cross_compile/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -42,8 +42,8 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        platform: [rk3588]
-        ros_distro: [rolling]
+        platform: ${{ github.event_name == 'workflow_dispatch' && fromJSON(format('["{0}"]', inputs.platform)) || fromJSON('["rk3588"]') }}
+        ros_distro: ${{ github.event_name == 'workflow_dispatch' && fromJSON(format('["{0}"]', inputs.ros_distro)) || fromJSON('["rolling"]') }}
       fail-fast: false
 
     steps:
@@ -67,7 +67,7 @@ jobs:
       # ── Stage 1: Build base image ──────────────────────────────────────
       - name: Build cc-base
         run: |
-          docker compose build cc-base
+          docker compose -f cross_compile/compose.yaml build cc-base
 
       - name: Push cc-base
         if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.push_images)
@@ -79,7 +79,7 @@ jobs:
       # ── Stage 2: Build toolchain image per platform ────────────────────
       - name: Build cc-toolchain (${{ matrix.platform }})
         run: |
-          PLATFORM=${{ matrix.platform }} docker compose build cc-toolchain
+          PLATFORM=${{ matrix.platform }} docker compose -f cross_compile/compose.yaml build cc-toolchain
         env:
           BUILDKIT_INLINE_CACHE: "1"
 
@@ -93,7 +93,7 @@ jobs:
       # ── Stage 3: Build vendor packages ─────────────────────────────────
       - name: Build vendor-packages (${{ matrix.platform }})
         run: |
-          PLATFORM=${{ matrix.platform }} docker compose build vendor-packages
+          PLATFORM=${{ matrix.platform }} docker compose -f cross_compile/compose.yaml build vendor-packages
         env:
           BUILDKIT_INLINE_CACHE: "1"
 
@@ -107,7 +107,7 @@ jobs:
       # ── Stage 4: Build ROS 2 per distro ────────────────────────────────
       - name: Build ROS 2 (${{ matrix.ros_distro }})
         run: |
-          PLATFORM=${{ matrix.platform }} ROS_DISTRO=${{ matrix.ros_distro }} docker compose build ros2
+          PLATFORM=${{ matrix.platform }} ROS_DISTRO=${{ matrix.ros_distro }} docker compose -f cross_compile/compose.yaml build ros2
         env:
           BUILDKIT_INLINE_CACHE: "1"