git: convert repos and tags config to new repo layout

2 files changed, 9 insertions, 21 deletions

diff --git a/src/lib/valid-repos.sh b/src/lib/valid-repos.sh
index 9ac9639..1f823f4 100644
--- a/src/lib/valid-repos.sh
+++ b/src/lib/valid-repos.sh
@@ -5,28 +5,17 @@
 
 # shellcheck disable=2034
 _repos=(
-	staging
-	testing
-	core
-	extra
-	community-staging
-	community-testing
-	community
-	multilib-staging
-	multilib-testing
-	multilib
+	core core-staging core-testing
+	extra extra-staging extra-testing
+	multilib multilib-staging multilib-testing
 	gnome-unstable
 	kde-unstable
 )
 
 # shellcheck disable=2034
 _build_repos=(
-	staging
-	testing
-	extra
-	multilib-staging
-	multilib-testing
-	multilib
+	extra staging testing
+	multilib multilib-staging multilib-testing
 	gnome-unstable
 	kde-unstable
 )
diff --git a/src/lib/valid-tags.sh b/src/lib/valid-tags.sh
index d628fd1..ca8d7d7 100644
--- a/src/lib/valid-tags.sh
+++ b/src/lib/valid-tags.sh
@@ -12,15 +12,14 @@ _arch=(
 # shellcheck disable=2034
 _tags=(
 	core-x86_64 core-any
+	core-staging-x86_64 core-staging-any
+	core-testing-x86_64 core-testing-any
 	extra-x86_64 extra-any
+	extra-staging-x86_64 extra-staging-any
+	extra-testing-x86_64 extra-testing-any
 	multilib-x86_64
-	staging-x86_64 staging-any
-	testing-x86_64 testing-any
 	multilib-testing-x86_64
 	multilib-staging-x86_64
-	community-x86_64 community-any
-	community-staging-x86_64 community-staging-any
-	community-testing-x86_64 community-testing-any
 	kde-unstable-x86_64 kde-unstable-any
 	gnome-unstable-x86_64 gnome-unstable-any
 )