diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d76b5d..af56d40 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
diff --git a/generate-index.py b/generate-index.py
index bcff558..a14c320 100644
--- a/generate-index.py
+++ b/generate-index.py
@@ -47,6 +47,7 @@ html = f'''
Add to /etc/pacman.conf
[antergos-pkgs]
SigLevel = Optional TrustAll
+Server = https://Antergos-NeXT.github.io/antergos-pkgs/$repo/os/$arch
Server = https://Antergos-NeXT.github.io/antergos-pkgs
diff --git a/packages/antergos-next-mirrorlist/antergos-next-mirrorlist b/packages/antergos-next-mirrorlist/antergos-next-mirrorlist
index a0f95b9..f3b6070 100644
--- a/packages/antergos-next-mirrorlist/antergos-next-mirrorlist
+++ b/packages/antergos-next-mirrorlist/antergos-next-mirrorlist
@@ -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