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
This commit is contained in:
+5
-2
@@ -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
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user