Hybrid mirror: support both flat and $repo/os/$arch layouts

CI: packages go into repo/antergos-pkgs/os/x86_64/ (standard layout), then flat copies are made at repo/ root for backward compat. Mirrorlist now has both Server lines, tried in order by pacman.
2026-06-08 19:26:56 +02:00
parent 55bfe56774
commit 8898f2eebe
3 changed files with 12 additions and 3 deletions
@@ -38,14 +38,19 @@ jobs:

    - name: Set up repo
      run: |
-        mkdir -p repo
-        cp /tmp/pkgout/*.pkg.tar.zst repo/
+        mkdir -p repo/antergos-pkgs/os/x86_64
+        cp /tmp/pkgout/*.pkg.tar.zst repo/antergos-pkgs/os/x86_64/

    - name: Generate repo database
      run: |
-        cd repo
+        cd repo/antergos-pkgs/os/x86_64
        repo-add antergos-pkgs.db.tar.gz *.pkg.tar.zst

+    - name: Copy to root for flat-URL compat
+      run: |
+        cp repo/antergos-pkgs/os/x86_64/*.pkg.tar.zst repo/
+        cp repo/antergos-pkgs/os/x86_64/antergos-pkgs.db* repo/
+
    - name: Generate index and package list
      run: python generate-index.py

@@ -47,6 +47,7 @@ html = f'''<!DOCTYPE html>
    <strong>Add to /etc/pacman.conf</strong>
    <pre>[antergos-pkgs]
 SigLevel = Optional TrustAll
+Server = https://Antergos-NeXT.github.io/antergos-pkgs/$repo/os/$arch
 Server = https://Antergos-NeXT.github.io/antergos-pkgs</pre>
  </div>

@@ -2,4 +2,7 @@
 ## Generated by antergos-pkgs CI
 ## Use pacman-mirrors or rankmirrors to select fastest mirror

+# Flat layout (packages at repo root)
 Server = https://antergos-next.github.io/antergos-pkgs
+# Standard layout (packages in $repo/os/$arch/)
+Server = https://antergos-next.github.io/antergos-pkgs/$repo/os/$arch