Merge pull request #371 from dhruveshb-mecha/pre-release-next

chore(shell): remove duplicate line in launcher Cargo.toml

Author: dhruveshb-mecha

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

@@ -30,12 +30,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Notification
-            package: mechanix-notification
           - name: Launcher
-            package: mechanix-launcher
-          - name: Keyboard
-            package: mechanix-keyboard
+            package: launcher
+
 
     runs-on: ubicloud-standard-2-arm
     environment: pre-release
@@ -44,10 +41,10 @@ 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
@@ -79,7 +76,11 @@ jobs:
             curl \
             librust-alsa-sys-dev \
             libpulse-dev \
-            libasound2-dev
+            libasound2-dev \
+            libxkbfile-dev \
+            libxkbcommon-x11-dev \            
+            wayland-protocols \
+            libxkbcommon-tools \
 
       # Pulp CLI setup
       - name: Setup | Pulp CLI
@@ -147,21 +148,30 @@ jobs:
       - 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/deb -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..."
           pulp deb distribution update \
             --name="${{ vars.MECHA_PULP_DEBS_REPOSITORY_NAME }}" \
             --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!"

shell/crates/launcher/Cargo.toml

@@ -21,3 +21,44 @@ settings_drawer = { path = "../settings_drawer" }
 universal_search = { path = "../universal_search" }
 running_apps = { path = "../running_apps" }
 types = { path = "../types" }
+
+[package.metadata.deb]
+maintainer = "Akshay Raina <[email protected]>"
+extended-description = """\
+Launcher application."""
+depends = "$auto"
+section = "utility"
+priority = "optional"
+assets = [
+    # target/release path is special, and gets replaced by cargo-deb with the actual target dir path.
+    [
+        "../../../target/release/launcher",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "../../../assets/icons/app-drawer/*",
+        "usr/share/mechanix/shell/launcher/assets/icons/app-drawer/",
+        "755",
+    ],
+    [
+        "../../../assets/icons/running-apps/*",
+        "usr/share/mechanix/shell/launcher/assets/icons/running-apps/",
+        "755",
+    ],
+    [
+        "../../../assets/icons/settings-drawer/*",
+        "usr/share/mechanix/shell/launcher/assets/icons/icons/settings-drawer/",
+        "755",
+    ],
+    [
+        "../../../assets/icons/status-bar/*",
+        "usr/share/mechanix/shell/launcher/assets/icons/icons/status-bar/",
+        "755",
+    ],
+    [
+        "../../../assets/icons/universal-search/*",
+        "usr/share/mechanix/shell/launcher/assets/icons/universal-search/",
+        "755",
+    ],
+]