chore: update build job, fixed versions

- changed all releases from 1-el8 and 1-el9 to 1 - updated build job to write files to per-repository directories
2026-01-03 23:24:58 +11:00 · 2026-01-03 23:24:58 +11:00 · 6d379d99b6
commit 6d379d99b6
parent 9e02175ead
37 changed files with 76 additions and 73 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@ -30,7 +30,7 @@ jobs:
        uses: actions/upload-artifact@v3
        with:
          name: rpms-8
-          path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
+          path: /workspace/unkin/rpmbuilder/dist/*/*/*.rpm

  build-9:
    runs-on: almalinux-8
@ -56,4 +56,4 @@ jobs:
        uses: actions/upload-artifact@v3
        with:
          name: rpms-9
-          path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
+          path: /workspace/unkin/rpmbuilder/dist/*/*/*.rpm
--- a/rpms/boilerplate/metadata.yaml
+++ b/rpms/boilerplate/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.10.1
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.10.1
--- a/rpms/cni-plugins/metadata.yaml
+++ b/rpms/cni-plugins/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.9.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.9.0
--- a/rpms/consul/metadata.yaml
+++ b/rpms/consul/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.22.2
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.22.2
--- a/rpms/etcd/metadata.yaml
+++ b/rpms/etcd/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 3.6.7
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 3.6.7
--- a/rpms/exportarr/metadata.yaml
+++ b/rpms/exportarr/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 2.3.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 2.3.0
--- a/rpms/frr_exporter/metadata.yaml
+++ b/rpms/frr_exporter/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.9.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.9.0
--- a/rpms/helmfile/metadata.yaml
+++ b/rpms/helmfile/metadata.yaml
@ -12,10 +12,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.2.3
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.2.3
--- a/rpms/incus/metadata.yaml
+++ b/rpms/incus/metadata.yaml
@ -10,5 +10,5 @@ builds:
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 6.20.0
--- a/rpms/nfpm/metadata.yaml
+++ b/rpms/nfpm/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 2.44.1
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 2.44.1
--- a/rpms/node_exporter/metadata.yaml
+++ b/rpms/node_exporter/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.10.2
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.10.2
--- a/rpms/nomad-autoscaler/metadata.yaml
+++ b/rpms/nomad-autoscaler/metadata.yaml
@ -12,10 +12,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.4.8
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.4.8
--- a/rpms/nzbget/metadata.yaml
+++ b/rpms/nzbget/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 2-el8
+  release: 2
  version: '25.4'
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 2-el9
+  release: 2
  version: '25.4'
--- a/rpms/openbao-plugin-secret-consul/metadata.yaml
+++ b/rpms/openbao-plugin-secret-consul/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.1.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.1.0
--- a/rpms/openbao-plugin-secret-nomad/metadata.yaml
+++ b/rpms/openbao-plugin-secret-nomad/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.1.5
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.1.5
--- a/rpms/openbao-plugins/metadata.yaml
+++ b/rpms/openbao-plugins/metadata.yaml
@ -9,10 +9,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.0.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.0.0
--- a/rpms/packer/metadata.yaml
+++ b/rpms/packer/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.14.3
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.14.3
--- a/rpms/postgres_exporter/metadata.yaml
+++ b/rpms/postgres_exporter/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.18.1
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.18.1
--- a/rpms/ruff/metadata.yaml
+++ b/rpms/ruff/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.14.10
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.14.10
--- a/rpms/stalwart-cli/metadata.yaml
+++ b/rpms/stalwart-cli/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.15.3
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.15.3
--- a/rpms/stalwart-foundationdb/metadata.yaml
+++ b/rpms/stalwart-foundationdb/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.15.3
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.15.3
--- a/rpms/stalwart/metadata.yaml
+++ b/rpms/stalwart/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.15.3
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.15.3
--- a/rpms/terraform/metadata.yaml
+++ b/rpms/terraform/metadata.yaml
@ -13,10 +13,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.14.3
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.14.3
--- a/rpms/terragrunt/metadata.yaml
+++ b/rpms/terragrunt/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.96.1
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.96.1
--- a/rpms/tflint/metadata.yaml
+++ b/rpms/tflint/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.60.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.60.0
--- a/rpms/uv/metadata.yaml
+++ b/rpms/uv/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.9.20
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.9.20
--- a/rpms/vals/metadata.yaml
+++ b/rpms/vals/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 0.43.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 0.43.0
--- a/rpms/vault/metadata.yaml
+++ b/rpms/vault/metadata.yaml
@ -13,10 +13,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.21.1
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.21.1
--- a/rpms/victoria-logs/metadata.yaml
+++ b/rpms/victoria-logs/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.43.1
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.43.1
--- a/rpms/vlutils/metadata.yaml
+++ b/rpms/vlutils/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.43.1
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.43.1
--- a/rpms/vmagent/metadata.yaml
+++ b/rpms/vmagent/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.132.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.132.0
--- a/rpms/vmalert/metadata.yaml
+++ b/rpms/vmalert/metadata.yaml
@ -10,10 +10,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.132.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.132.0
--- a/rpms/vminsert/metadata.yaml
+++ b/rpms/vminsert/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.132.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.132.0
--- a/rpms/vmselect/metadata.yaml
+++ b/rpms/vmselect/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.132.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.132.0
--- a/rpms/vmstorage/metadata.yaml
+++ b/rpms/vmstorage/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.132.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.132.0
--- a/rpms/vmutils/metadata.yaml
+++ b/rpms/vmutils/metadata.yaml
@ -11,10 +11,10 @@ builds:
 - repository:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
  version: 1.132.0
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
  version: 1.132.0
--- a/tools/build
+++ b/tools/build
@ -623,6 +623,7 @@ def build_package_docker(
    package_version: str,
    package_release: str,
    dist_dir: Path,
+    repository: str,
    base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest",
    dry_run: bool = False
 ) -> bool:
@ -635,6 +636,7 @@ def build_package_docker(
        package_version: Package version
        package_release: Package release number
        dist_dir: Directory to store built packages
+        repository: Repository path (e.g., 'almalinux/el9')
        base_image: Base Docker image to use for building
        dry_run: If True, only show what would be done

@ -644,8 +646,8 @@ def build_package_docker(
    logger = logging.getLogger(__name__)

    try:
-        # Ensure dist directory exists
-        package_dist_dir = dist_dir / package_name
+        # Ensure dist directory exists with repository structure
+        package_dist_dir = dist_dir / repository / package_name
        if not dry_run:
            package_dist_dir.mkdir(parents=True, exist_ok=True)

@ -1085,6 +1087,7 @@ class Builder:
                package_version=package_info.version,
                package_release=package_info.release,
                dist_dir=self.dist_dir,
+                repository=package_info.distro,
                base_image=package_info.base_image,
                dry_run=dry_run
            )