From 83f5dbae0daa389d9b314274fb7a5d21edc98350 Mon Sep 17 00:00:00 2001
From: Alvin Vilaythong <alvin@vilaythong.us>
Date: Tue, 15 Sep 2026 08:01:30 +1000
Subject: [PATCH] Fix tests: correct CachyOS and chaotic-aur mirror URLs,
 install keyrings properly

---
 .gitea/workflows/tests.yaml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/tests.yaml b/.gitea/workflows/tests.yaml
index 94d554e..9349bd4 100644
--- a/.gitea/workflows/tests.yaml
+++ b/.gitea/workflows/tests.yaml
@@ -18,25 +18,33 @@ jobs:
 
       - name: Set up CachyOS repo
         run: |
-          # Add CachyOS mirrorlist
-          printf '%s\n' \
-            'Server = https://mirror.cachyos.org/$repo/$arch' \
-            > /etc/pacman.d/cachyos-mirrorlist
+          # Import CachyOS key
+          pacman-key --recv-keys F3B607488DB35A47 --keyserver keyserver.ubuntu.com
+          pacman-key --lsign-key F3B607488DB35A47
+
+          # Install keyring and mirrorlist packages
+          pacman -U --noconfirm \
+            'https://mirror.cachyos.org/repo/x86_64/cachyos/cachyos-keyring-20240331-1-any.pkg.tar.zst' \
+            'https://mirror.cachyos.org/repo/x86_64/cachyos/cachyos-mirrorlist-27-1-any.pkg.tar.zst'
 
           # Add CachyOS repo to pacman.conf
-          printf '\n[cachyos]\nSigLevel = Optional TrustAll\nInclude = /etc/pacman.d/cachyos-mirrorlist\n' \
+          printf '\n[cachyos]\nInclude = /etc/pacman.d/cachyos-mirrorlist\n' \
             >> /etc/pacman.conf
 
           pacman -Syu --noconfirm
 
       - name: Set up chaotic-aur repo
         run: |
-          # Add chaotic-aur mirrorlist
-          printf '%s\n' \
-            'Server = https://chaotic.archlinux.org/$repo/$arch' \
-            > /etc/pacman.d/chaotic-mirrorlist
+          # Import chaotic-aur key
+          pacman-key --recv-keys 3056513887B78A2F --keyserver keyserver.ubuntu.com
+          pacman-key --lsign-key 3056513887B78A2F
 
-          printf '\n[chaotic-aur]\nSigLevel = Optional TrustAll\nInclude = /etc/pacman.d/chaotic-mirrorlist\n' \
+          # Install keyring and mirrorlist packages
+          pacman -U --noconfirm \
+            'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' \
+            'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
+
+          printf '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist\n' \
             >> /etc/pacman.conf
 
           pacman -Syu --noconfirm