Merge pull request #35 from zzjin/dev_server_rust

feat: enhance server-rust release workflow and build process for mult…

Author: zzjin

.github/workflows/server-rust-release.yml

@@ -11,12 +11,25 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
+    env:
+      SERVER_RUST_TARGETS: x86_64-unknown-linux-musl aarch64-unknown-linux-musl
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Cache cargo artifacts
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            packages/server-rust/target
+          key: ${{ runner.os }}-server-rust-${{ hashFiles('packages/server-rust/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-server-rust-
+
       - name: Install nightly toolchain
         uses: dtolnay/rust-toolchain@master
         with:
@@ -36,9 +49,37 @@ jobs:
           fi
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
-      - name: Build release binary
+      - name: Build release binaries
         working-directory: packages/server-rust
-        run: make build
+        run: |
+          for TARGET in $SERVER_RUST_TARGETS; do
+            make build TARGET=$TARGET
+          done
+
+      - name: Prepare release artifacts
+        run: |
+          mkdir -p packages/server-rust/dist
+          for TARGET in $SERVER_RUST_TARGETS; do
+            SRC="packages/server-rust/target/$TARGET/release/devbox-sdk-server"
+            case "$TARGET" in
+              x86_64-unknown-linux-musl)
+                DEST_NAME=devbox-sdk-server-linux-amd64
+                ;;
+              aarch64-unknown-linux-musl)
+                DEST_NAME=devbox-sdk-server-linux-arm64
+                ;;
+              *)
+                DEST_NAME=devbox-sdk-server-$TARGET
+                ;;
+            esac
+            DEST="packages/server-rust/dist/$DEST_NAME"
+            if [ ! -f "$SRC" ]; then
+              echo "Expected binary not found at $SRC" >&2
+              exit 1
+            fi
+            cp "$SRC" "$DEST"
+            chmod +x "$DEST"
+          done
 
       - name: Generate release notes
         id: notes
@@ -49,7 +90,11 @@ jobs:
             echo "## devbox-sdk-server v$VERSION"
             echo ""
             echo "- Commit: $SHA"
-            echo "- Target: x86_64-unknown-linux-musl"
+            echo ""
+            echo "### Targets"
+            for TARGET in $SERVER_RUST_TARGETS; do
+              echo "- $TARGET"
+            done
             echo ""
             echo "### Changes"
             git log -20 --pretty=format:'- %h %s'
@@ -65,5 +110,7 @@ jobs:
           tag_name: devbox-sdk-server-v${{ steps.crate.outputs.version }}
           name: devbox-sdk-server v${{ steps.crate.outputs.version }}
           body_path: release-notes.md
-          files: packages/server-rust/target/x86_64-unknown-linux-musl/release/devbox-sdk-server
+          files: |
+            packages/server-rust/dist/devbox-sdk-server-linux-amd64
+            packages/server-rust/dist/devbox-sdk-server-linux-arm64
           fail_on_unmatched_files: true

packages/server-rust/Makefile

@@ -1,23 +1,31 @@
 # DevBox Server Rust Makefile
 
-BINARY_NAME=server-rust
-BUILD_DIR=./target/x86_64-unknown-linux-musl/release
+BINARY_NAME=devbox-sdk-server
+TARGET ?= x86_64-unknown-linux-musl
+SUPPORTED_TARGETS = x86_64-unknown-linux-musl aarch64-unknown-linux-musl
+BUILD_DIR=./target/$(TARGET)/release
 MAIN_PATH=./src/main.rs
 
 # Default to release build
 BUILD_FLAGS=--release
 
-.PHONY: help build run test fmt check clean clippy
+.PHONY: help build build-all run test fmt check clean clippy
 
 all: build
 
 help: ## Show available commands
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "  %-14s %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
-build: ## Build release binary
-	@cargo cross build --toolchain nightly --build-std -Z build-std-features="optimize_for_size" --release --target x86_64-unknown-linux-musl
+build: ## Build release binary (override TARGET=<triple> for other arches)
+	@echo "Building target $(TARGET)"
+	@cargo cross build --toolchain nightly --build-std -Z build-std-features="optimize_for_size" --release --target $(TARGET)
 	@echo "Binary: $(BUILD_DIR)/$(BINARY_NAME)"
 
+build-all: ## Build release binaries for all supported targets
+	@for target in $(SUPPORTED_TARGETS); do \
+		$(MAKE) build TARGET=$$target; \
+	done
+
 build-release-upx: build ## Build release binary and compress with UPX
 	@upx --best --lzma $(BUILD_DIR)/$(BINARY_NAME)
 	@echo "Compressed Binary: $(BUILD_DIR)/$(BINARY_NAME)"

packages/server-rust/README.md

@@ -83,8 +83,10 @@ packages/server-rust/
 
 2. **Build an optimized release binary**:
    ```bash
-   make build
-   # Binary will be created at: ./target/x86_64-unknown-linux-musl/release/server-rust
+  make build                               # defaults to TARGET=x86_64-unknown-linux-musl
+  make build TARGET=aarch64-unknown-linux-musl
+  # Binary will be created at: ./target/<target>/release/devbox-sdk-server
+  # Build both release binaries at once: make build-all
    ```
 
 3. **Build with UPX compression** (optional, requires UPX):
@@ -97,9 +99,20 @@ packages/server-rust/
    ```bash
    make run
    # Or using the built binary:
-   ./target/release/server-rust
+  ./target/<target>/release/devbox-sdk-server
    ```
 
+### Multi-architecture builds
+
+Cross-compilation is handled through `cargo cross`. Use the `TARGET` variable (defaults to `x86_64-unknown-linux-musl`) to select an architecture:
+
+| TARGET | Platform | Output binary |
+|--------|----------|----------------|
+| `x86_64-unknown-linux-musl` | Linux x86_64 (glibc-compatible, fully static) | `./target/x86_64-unknown-linux-musl/release/devbox-sdk-server` |
+| `aarch64-unknown-linux-musl` | Linux ARM64 (fully static) | `./target/aarch64-unknown-linux-musl/release/devbox-sdk-server` |
+
+Run `make build TARGET=<triple>` to produce a single binary or `make build-all` to generate both release artifacts in one pass.
+
 ### Binary Size Optimizations
 The release build is heavily optimized for size:
 - **LTO**: Fat link-time optimization (`lto = "fat"`)