From e5be44c5fc73e2fd7063645d78f866cadb264e50 Mon Sep 17 00:00:00 2001
From: Reei-dp <SlimsSlims1337@gmail.com>
Date: Mon, 6 Apr 2026 23:21:00 +0400
Subject: [PATCH] fix ci

---
 .github/workflows/aur-publish.yml    | 19 ++++++++++++++-----
 .github/workflows/release.yml        | 17 ++++++++++++-----
 lib/widgets/desktop_tray_holder.dart |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/aur-publish.yml b/.github/workflows/aur-publish.yml
index b7ead84..0e2f0c7 100644
--- a/.github/workflows/aur-publish.yml
+++ b/.github/workflows/aur-publish.yml
@@ -63,14 +63,23 @@ jobs:
 
       - name: Generate .SRCINFO (Arch makepkg)
         run: |
-          # makepkg refuses to run as root; container default user is root.
+          set -euo pipefail
+          out="$GITHUB_WORKSPACE/aur-repo/.SRCINFO"
+          # makepkg must not run as root; minimal image needs a full pacman sync + base-devel
+          # so makepkg can parse the PKGBUILD. Empty stdout → AUR hook: "does not contain pkgbase".
           docker run --rm \
             -v "$GITHUB_WORKSPACE/aur-repo:/pkg" \
             archlinux:latest \
-            bash -lc "set -euo pipefail; pacman -Sy --noconfirm archlinux-keyring pacman >/dev/null; useradd -m builduser; chown -R builduser:builduser /pkg; su builduser -s /bin/bash -c 'cd /pkg && makepkg --printsrcinfo'" \
-            > "$GITHUB_WORKSPACE/aur-repo/.SRCINFO"
-          # Docker chowned the bind-mount to builduser; restore runner ownership for git.
+            bash -lc '
+              set -euo pipefail
+              pacman -Syu --noconfirm --needed archlinux-keyring pacman base-devel
+              useradd -m -s /bin/bash builduser
+              chown -R builduser:builduser /pkg
+              runuser -u builduser -- env HOME=/home/builduser bash -lc "cd /pkg && makepkg --printsrcinfo"
+            ' > "$out"
           sudo chown -R "$(id -u):$(id -g)" "$GITHUB_WORKSPACE/aur-repo"
+          test -s "$out"
+          grep -qE "^pkgbase[[:space:]]*=" "$out" || { echo "::error::Invalid .SRCINFO"; head -50 "$out"; exit 1; }
 
       - name: Commit and push to AUR
         run: |
@@ -84,4 +93,4 @@ jobs:
             exit 0
           fi
           git commit -m "chore: ${{ github.event.inputs.version }}"
-          git push origin HEAD:master || git push origin HEAD:main
+          git push origin HEAD:master
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 91bc64a..231d04e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -245,14 +245,21 @@ jobs:
       - name: Generate .SRCINFO (Arch makepkg)
         if: steps.aur.outputs.enabled == 'true'
         run: |
-          # makepkg refuses to run as root; container default user is root.
+          set -euo pipefail
+          out="$GITHUB_WORKSPACE/aur-repo/.SRCINFO"
           docker run --rm \
             -v "$GITHUB_WORKSPACE/aur-repo:/pkg" \
             archlinux:latest \
-            bash -lc "set -euo pipefail; pacman -Sy --noconfirm archlinux-keyring pacman >/dev/null; useradd -m builduser; chown -R builduser:builduser /pkg; su builduser -s /bin/bash -c 'cd /pkg && makepkg --printsrcinfo'" \
-            > "$GITHUB_WORKSPACE/aur-repo/.SRCINFO"
-          # Docker chowned the bind-mount to builduser; restore runner ownership for git.
+            bash -lc '
+              set -euo pipefail
+              pacman -Syu --noconfirm --needed archlinux-keyring pacman base-devel
+              useradd -m -s /bin/bash builduser
+              chown -R builduser:builduser /pkg
+              runuser -u builduser -- env HOME=/home/builduser bash -lc "cd /pkg && makepkg --printsrcinfo"
+            ' > "$out"
           sudo chown -R "$(id -u):$(id -g)" "$GITHUB_WORKSPACE/aur-repo"
+          test -s "$out"
+          grep -qE "^pkgbase[[:space:]]*=" "$out" || { echo "::error::Invalid .SRCINFO"; head -50 "$out"; exit 1; }
 
       - name: Commit and push to AUR
         if: steps.aur.outputs.enabled == 'true'
@@ -269,4 +276,4 @@ jobs:
             exit 0
           fi
           git commit -m "chore: ${VERSION}"
-          git push origin HEAD:master || git push origin HEAD:main
+          git push origin HEAD:master
diff --git a/lib/widgets/desktop_tray_holder.dart b/lib/widgets/desktop_tray_holder.dart
index fe0fc2c..bd08263 100644
--- a/lib/widgets/desktop_tray_holder.dart
+++ b/lib/widgets/desktop_tray_holder.dart
@@ -14,7 +14,7 @@ bool get desktopTraySupported =>
 
 class DesktopTrayHolder extends StatefulWidget {
   const DesktopTrayHolder({super.key, required this.child});
- 
+
   final Widget child;
 
   @override