diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d09960b..dd81a80 100644 --- 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 diff --git a/rpms/boilerplate/metadata.yaml b/rpms/boilerplate/metadata.yaml index 0f9ffa0..7359435 100644 --- 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 diff --git a/rpms/cni-plugins/metadata.yaml b/rpms/cni-plugins/metadata.yaml index db151df..f6ed392 100644 --- 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 diff --git a/rpms/consul/metadata.yaml b/rpms/consul/metadata.yaml index 2349853..bb17342 100644 --- 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 diff --git a/rpms/etcd/metadata.yaml b/rpms/etcd/metadata.yaml index b53526a..f97ffa5 100644 --- 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 diff --git a/rpms/exportarr/metadata.yaml b/rpms/exportarr/metadata.yaml index 4a61cda..aea8e29 100644 --- 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 diff --git a/rpms/frr_exporter/metadata.yaml b/rpms/frr_exporter/metadata.yaml index 868d312..2d6ed95 100644 --- 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 diff --git a/rpms/helmfile/metadata.yaml b/rpms/helmfile/metadata.yaml index 600a590..75d5302 100644 --- 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 diff --git a/rpms/incus/metadata.yaml b/rpms/incus/metadata.yaml index e8ae0de..ff411d3 100644 --- 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 diff --git a/rpms/nfpm/metadata.yaml b/rpms/nfpm/metadata.yaml index c23ed85..3543175 100644 --- 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 diff --git a/rpms/node_exporter/metadata.yaml b/rpms/node_exporter/metadata.yaml index f8a5d8c..de0837f 100644 --- 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 diff --git a/rpms/nomad-autoscaler/metadata.yaml b/rpms/nomad-autoscaler/metadata.yaml index 6962ac8..9d9c3b9 100644 --- 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 diff --git a/rpms/nzbget/metadata.yaml b/rpms/nzbget/metadata.yaml index b7198ba..7d0a320 100644 --- 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' diff --git a/rpms/openbao-plugin-secret-consul/metadata.yaml b/rpms/openbao-plugin-secret-consul/metadata.yaml index 4c1845e..3c5f632 100644 --- 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 diff --git a/rpms/openbao-plugin-secret-nomad/metadata.yaml b/rpms/openbao-plugin-secret-nomad/metadata.yaml index 92aed3d..a7af86e 100644 --- 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 diff --git a/rpms/openbao-plugins/metadata.yaml b/rpms/openbao-plugins/metadata.yaml index d128055..aa1320d 100644 --- 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 diff --git a/rpms/packer/metadata.yaml b/rpms/packer/metadata.yaml index 6106a0b..e4a38bc 100644 --- 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 diff --git a/rpms/postgres_exporter/metadata.yaml b/rpms/postgres_exporter/metadata.yaml index e78d049..42f01f5 100644 --- 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 diff --git a/rpms/ruff/metadata.yaml b/rpms/ruff/metadata.yaml index 2b74741..488ca07 100644 --- 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 diff --git a/rpms/stalwart-cli/metadata.yaml b/rpms/stalwart-cli/metadata.yaml index 0941074..53af641 100644 --- 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 diff --git a/rpms/stalwart-foundationdb/metadata.yaml b/rpms/stalwart-foundationdb/metadata.yaml index 1358daf..99221ac 100644 --- 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 diff --git a/rpms/stalwart/metadata.yaml b/rpms/stalwart/metadata.yaml index 932e96c..0e78b25 100644 --- 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 diff --git a/rpms/terraform/metadata.yaml b/rpms/terraform/metadata.yaml index e169d60..6ef9f31 100644 --- 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 diff --git a/rpms/terragrunt/metadata.yaml b/rpms/terragrunt/metadata.yaml index eb849c5..b503174 100644 --- 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 diff --git a/rpms/tflint/metadata.yaml b/rpms/tflint/metadata.yaml index 8d681c4..f4f7382 100644 --- 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 diff --git a/rpms/uv/metadata.yaml b/rpms/uv/metadata.yaml index 63874ec..98b758f 100644 --- 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 diff --git a/rpms/vals/metadata.yaml b/rpms/vals/metadata.yaml index 8d77049..8caa00b 100644 --- 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 diff --git a/rpms/vault/metadata.yaml b/rpms/vault/metadata.yaml index 37ce882..d0f3cdd 100644 --- 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 diff --git a/rpms/victoria-logs/metadata.yaml b/rpms/victoria-logs/metadata.yaml index 707576c..e0de32e 100644 --- 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 diff --git a/rpms/vlutils/metadata.yaml b/rpms/vlutils/metadata.yaml index 59a9e6e..f542817 100644 --- 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 diff --git a/rpms/vmagent/metadata.yaml b/rpms/vmagent/metadata.yaml index c66ad96..c6e5826 100644 --- 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 diff --git a/rpms/vmalert/metadata.yaml b/rpms/vmalert/metadata.yaml index dbec09e..248b4e0 100644 --- 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 diff --git a/rpms/vminsert/metadata.yaml b/rpms/vminsert/metadata.yaml index cdefa93..c3a7095 100644 --- 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 diff --git a/rpms/vmselect/metadata.yaml b/rpms/vmselect/metadata.yaml index 6bfb8fd..389a2c9 100644 --- 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 diff --git a/rpms/vmstorage/metadata.yaml b/rpms/vmstorage/metadata.yaml index 5b65d67..1e6910d 100644 --- 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 diff --git a/rpms/vmutils/metadata.yaml b/rpms/vmutils/metadata.yaml index 1a17515..700d5a5 100644 --- 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 diff --git a/tools/build b/tools/build index f0df967..b1775e9 100755 --- 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 )