Source cargo env before using rustup in install step

GITHUB_PATH only takes effect in subsequent steps, but rustup/rustc/cargo
are called within the same step. Adding `. "$HOME/.cargo/env"` immediately
after install puts cargo/rustup in PATH for the remainder of the step.
Fixed in both Linux and macOS jobs.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.gitea/workflows/build-app.yml

@@ -20,6 +20,18 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     steps:
+      - name: Install Node.js
+        run: |
+          if command -v node >/dev/null 2>&1; then
+            echo "Node.js already installed: $(node --version)"
+          else
+            echo "Installing Node.js 22..."
+            curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash -
+            sudo apt-get install -y nodejs
+          fi
+          node --version
+          npm --version
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -62,29 +74,18 @@ jobs:
 
       - name: Install Rust stable
         run: |
-          if command -v rustup &>/dev/null; then
+          if command -v rustup >/dev/null 2>&1; then
             echo "Rust already installed: $(rustc --version)"
             rustup update stable
             rustup default stable
           else
             curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
-            . "$HOME/.cargo/env"
           fi
+          . "$HOME/.cargo/env"
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
           rustc --version
           cargo --version
 
-      - name: Install Node.js
-        run: |
-          if command -v node &>/dev/null; then
-            echo "Node.js already installed: $(node --version)"
-          else
-            echo "Installing Node.js 22..."
-            curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash -
-            sudo apt-get install -y nodejs
-          fi
-          node --version
-          npm --version
-
       - name: Install frontend dependencies
         working-directory: ./app
         run: npm ci
@@ -169,13 +170,15 @@ jobs:
 
       - name: Install Rust stable
         run: |
-          if command -v rustup &>/dev/null; then
+          if command -v rustup >/dev/null 2>&1; then
+            echo "Rust already installed: $(rustc --version)"
             rustup update stable
             rustup default stable
           else
             curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
-            . "$HOME/.cargo/env"
           fi
+          . "$HOME/.cargo/env"
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
           rustup target add aarch64-apple-darwin x86_64-apple-darwin
           rustc --version
           cargo --version
@@ -190,8 +193,6 @@ jobs:
 
       - name: Build Tauri app (universal)
         working-directory: ./app
-        env:
-          PATH: ${{ format('{0}/.cargo/bin:{1}', env.HOME, env.PATH) }}
         run: npx tauri build --target universal-apple-darwin
 
       - name: Collect artifacts

.gitea/workflows/build.yml

@@ -21,6 +21,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -36,6 +39,7 @@ jobs:
         with:
           context: ./container
           file: ./container/Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: ${{ gitea.event_name == 'push' }}
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

container/Dockerfile

@@ -1,5 +1,6 @@
 FROM ubuntu:24.04
 
+# Multi-arch: builds for linux/amd64 and linux/arm64 (Apple Silicon)
 # Avoid interactive prompts during package install
 ENV DEBIAN_FRONTEND=noninteractive