rocky-linux/peridot
4
0
Fork 0
mirror of https://github.com/rocky-linux/peridot.git synced 2024-12-21 02:08:29 +00:00
Code Issues Projects Releases Activity

Merge pull request #112 from NeilHanlon/main

Browse Source 
fix(regression): respect modules enabled by ModuleMd during module builds
This commit is contained in:
resf-prow[bot] 2023-03-30 20:18:29 +00:00 committed by GitHub
commit 10aab151d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
peridot/builder/v1/workflow/arch.go
View File

@ -687,8 +687,15 @@ func (c *Controller) BuildArchActivity(ctx context.Context, projectId string, pa
c.log.Infof("no extra options to process for package") c.log.Infof("no extra options to process for package")
} }
extraOptions.DisabledModules = disableModules if extraOptions.DisabledModules == nil {
extraOptions.Modules = enableModules extraOptions.DisabledModules = []string{}
}
extraOptions.DisabledModules = append(extraOptions.DisabledModules, disableModules...)
if extraOptions.Modules == nil {
extraOptions.Modules = []string{}
}
extraOptions.Modules = append(extraOptions.Modules, enableModules...)
hostArch := os.Getenv("REAL_BUILD_ARCH") hostArch := os.Getenv("REAL_BUILD_ARCH")
err = c.writeMockConfig(&project, packageVersion, extraOptions, arch, hostArch, pkgGroup) err = c.writeMockConfig(&project, packageVersion, extraOptions, arch, hostArch, pkgGroup)

11
peridot/builder/v1/workflow/srpm.go
View File

@ -425,8 +425,15 @@ func (c *Controller) BuildSRPMActivity(ctx context.Context, upstreamPrefix strin
c.log.Infof("no extra options to process for package") c.log.Infof("no extra options to process for package")
} }
extraOptions.DisabledModules = disableModules if extraOptions.DisabledModules == nil {
extraOptions.Modules = enableModules extraOptions.DisabledModules = []string{}
}
extraOptions.DisabledModules = append(extraOptions.DisabledModules, disableModules...)
if extraOptions.Modules == nil {
extraOptions.Modules = []string{}
}
extraOptions.Modules = append(extraOptions.Modules, enableModules...)
hostArch := os.Getenv("REAL_BUILD_ARCH") hostArch := os.Getenv("REAL_BUILD_ARCH")
extraOptions.EnableNetworking = true extraOptions.EnableNetworking = true