Merge branch 'pre-release' of github.com:mecha-org/mechanix-gui into pre/status-bar

Author: swetar-mecha

.github/workflows/build-shell-aarch64.yml

@@ -1,4 +1,4 @@
-name: Shell - Build aarch64
+name: Shell Crates - Build, Package, and Publish for aarch64
 
 on:
   workflow_dispatch:
@@ -30,12 +30,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Notification
-            package: mechanix-notification
-          - name: Launcher
-            package: mechanix-launcher
-          - name: Keyboard
-            package: mechanix-keyboard
+          - name: Launcher Crate Build
+            package: launcher
 
     runs-on: ubicloud-standard-2-arm
     environment: pre-release
@@ -44,42 +40,58 @@ jobs:
       - name: Setup | Checkout
         uses: actions/checkout@v4
 
-      - name: Install Rust 1.86.0
+      - name: Install Rust 1.91.1
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.86.0
+          toolchain: 1.91.1
 
       - name: Install cargo-deb
         run: cargo install cargo-deb
 
       - name: Install dependencies
         run: |
           sudo apt update
-          sudo apt install -y \
-            g++ \
-            pkg-config \
-            libx11-dev \
-            libudev-dev \
-            libxkbcommon-x11-0 \
-            libgles2-mesa-dev \
-            libgl1-mesa-dev \
-            libegl-dev \
-            libegl1-mesa-dev \
-            libvulkan-dev \
-            libwayland-dev \
-            libxkbcommon-dev \
-            libdbus-1-dev \
-            libpam0g-dev \
-            libclang-dev \
-            libpulse-dev \
-            libasound-dev \
-            python3-pip \
-            pipx \
-            jq \
-            curl \
-            librust-alsa-sys-dev \
-            libpulse-dev \
+
+          # List of packages
+          packages=(
+            g++
+            pkg-config
+            libx11-dev
+            libudev-dev
+            libxkbcommon-x11-0
+            libgles2-mesa-dev
+            libgl1-mesa-dev
+            libegl-dev
+            libegl1-mesa-dev
+            libvulkan-dev
+            libwayland-dev
+            libxkbcommon-dev
+            libdbus-1-dev
+            libpam0g-dev
+            libclang-dev
+            libpulse-dev
+            libasound-dev
+            python3-pip
+            pipx
+            jq
+            curl
+            librust-alsa-sys-dev
             libasound2-dev
+            libxkbfile-dev
+            libxkbcommon-x11-dev
+            wayland-protocols
+            libxkbcommon-tools
+          )
+
+          # Loop over packages and install only available ones
+          for pkg in "${packages[@]}"; do
+            if apt-cache show "$pkg" > /dev/null 2>&1; then
+              echo "[INFO] Installing $pkg"
+              sudo apt install -y "$pkg"
+            else
+              echo "[WARN] Package $pkg not found, skipping."
+            fi
+          done
 
       # Pulp CLI setup
       - name: Setup | Pulp CLI
@@ -105,13 +117,13 @@ jobs:
             --base-url "$PULP_API_URL" \
             --overwrite
 
-      - name: Build [${{ matrix.package }}]
+      - name: Build ${{ matrix.package }}
         run: |
           cargo --config net.git-fetch-with-cli=true fetch
           cargo build --release --package ${{ matrix.package }}
           ls -la target/release
 
-      - name: Package deb [${{ matrix.package }}]
+      - name: Package deb ${{ matrix.package }}
         run: |
           sudo apt install -y fakeroot
           fakeroot cargo deb --no-build --package ${{ matrix.package }}
@@ -130,9 +142,9 @@ jobs:
           fakeroot dpkg-deb -R "$DEB_FILE" "$TMPDIR/pkg"
           fakeroot dpkg-deb -b "$TMPDIR/pkg" "$DEB_FILE"  
 
-          echo "[INFO] ✅ Repacked: $DEB_FILE"   
+          echo "[INFO] ✅ Repacked: $DEB_FILE"
 
-      - name: Prepare artifacts [${{ matrix.package }}]
+      - name: Prepare artifacts ${{ matrix.package }}
         run: |
           mkdir -p build
           cp target/release/${{ matrix.package }} ./build || true
@@ -144,18 +156,27 @@ jobs:
           name: ${{ matrix.package }}-artifacts
           path: ./build/*
 
-      - name: Publish to Pulp [${{ matrix.package }}]
+      - name: Publish to Pulp ${{ matrix.package }}
         run: |
           set -euo pipefail
-          DEB_FILE=$(ls target/debian/${{ matrix.package }}_*.deb | head -n1)
-          echo "[INFO] Uploading: $DEB_FILE"
+
+          DEB_FILE=$(find ./build -name "${{ matrix.package }}*.deb" -type f | head -n1)
+
+          if [ -z "$DEB_FILE" ]; then
+            echo "[ERROR] No .deb file found for ${{ matrix.package }}"
+            exit 1
+          fi
+
+          echo "[INFO] 📦 Publishing: $DEB_FILE"
+
           pulp deb content upload \
             --repository="${{ vars.MECHA_PULP_DEBS_REPOSITORY_NAME }}" \
             --file="$DEB_FILE"
 
           echo "[INFO] Creating publication..."
           PUB_HREF=$(pulp deb publication create \
             --repository="${{ vars.MECHA_PULP_DEBS_REPOSITORY_NAME }}" \
+            --signing-service=mecha-pkg-sign \
             | jq -r '.pulp_href')
 
           echo "[INFO] Updating distribution..."
@@ -164,4 +185,4 @@ jobs:
             --base-path="${{ vars.MECHA_PULP_DEBS_REPOSITORY_NAME }}" \
             --repository="${{ vars.MECHA_PULP_DEBS_REPOSITORY_NAME }}"
 
-          echo "[INFO] ✅ Package ${{ matrix.package }} published."
+          echo "[INFO] ✅ Package ${{ matrix.package }} published successfully!"

Cargo.toml

@@ -38,7 +38,10 @@ serde = { version = "1.0.219", features = ["derive"] }
 futures = "0.3.31"
 thiserror = "2.0.12"
 env_logger = { version = "0.11.8" }
-gpui = { version = "0.2.2", default-features = false, features = ["x11"] }
+gpui = { git = "https://github.com/namana-mecha/zed.git", rev = "7a0d37756b35e60e18b8e720b67f6b3ef464e17d", features = [
+    "wayland",
+    "linux-impeller",
+] }
 rust-embed = "8.8.0"
 networkmanager = { path = "dbus/freedesktop/networkmanager" }
 bluez = { path = "dbus/freedesktop/bluez" }