You've already forked sap-jenkins-library
mirror of
https://github.com/SAP/jenkins-library.git
synced 2025-12-01 23:02:43 +02:00
feat (buildSettingsInfo) new common cpe which holds build settings json value (#3272)
* create build settings for maven * cases for when mavenBuild may be present * fixing unit test for mavenBuild to include cpe * changing position of buildSettngsJson to be called atfter build runs * package * extending the struct for other build types * adding values for mta build settings * changing config data type * adding npm build settings * unit tests * fix trailing space * typo correction in yaml * Vitalii/build settings info (#3277) * Add buildsettings package * Improve buildSetting package for mta, npm * Add unit-test * Fix * Fix Co-authored-by: Vitalii Sidorov <vitalii.sidorov@sap.com> * review changes * removing buildTool param * changing npm script name * fix npmExecute tests * including build settings info in npm struct Co-authored-by: Your Name <you@example.com> Co-authored-by: kingvvgo <56587879+kingvvgo@users.noreply.github.com> Co-authored-by: Vitalii Sidorov <vitalii.sidorov@sap.com> Co-authored-by: Oliver Nocon <33484802+OliverNocon@users.noreply.github.com>
This commit is contained in:
@@ -1,23 +1,24 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"github.com/SAP/jenkins-library/pkg/buildsettings"
|
||||
"github.com/SAP/jenkins-library/pkg/log"
|
||||
"github.com/SAP/jenkins-library/pkg/npm"
|
||||
"github.com/SAP/jenkins-library/pkg/telemetry"
|
||||
)
|
||||
|
||||
func npmExecuteScripts(config npmExecuteScriptsOptions, telemetryData *telemetry.CustomData) {
|
||||
func npmExecuteScripts(config npmExecuteScriptsOptions, telemetryData *telemetry.CustomData, commonPipelineEnvironment *npmExecuteScriptsCommonPipelineEnvironment) {
|
||||
npmExecutorOptions := npm.ExecutorOptions{DefaultNpmRegistry: config.DefaultNpmRegistry}
|
||||
npmExecutor := npm.NewExecutor(npmExecutorOptions)
|
||||
|
||||
err := runNpmExecuteScripts(npmExecutor, &config)
|
||||
err := runNpmExecuteScripts(npmExecutor, &config, commonPipelineEnvironment)
|
||||
if err != nil {
|
||||
log.SetErrorCategory(log.ErrorBuild)
|
||||
log.Entry().WithError(err).Fatal("step execution failed")
|
||||
}
|
||||
}
|
||||
|
||||
func runNpmExecuteScripts(npmExecutor npm.Executor, config *npmExecuteScriptsOptions) error {
|
||||
func runNpmExecuteScripts(npmExecutor npm.Executor, config *npmExecuteScriptsOptions, commonPipelineEnvironment *npmExecuteScriptsCommonPipelineEnvironment) error {
|
||||
if config.Install {
|
||||
packageJSONFiles, err := npmExecutor.FindPackageJSONFilesWithExcludes(config.BuildDescriptorExcludeList)
|
||||
if err != nil {
|
||||
@@ -46,6 +47,19 @@ func runNpmExecuteScripts(npmExecutor npm.Executor, config *npmExecuteScriptsOpt
|
||||
return err
|
||||
}
|
||||
|
||||
log.Entry().Infof("creating build settings information...")
|
||||
npmConfig := buildsettings.BuildOptions{
|
||||
Publish: config.Publish,
|
||||
CreateBOM: config.CreateBOM,
|
||||
DefaultNpmRegistry: config.DefaultNpmRegistry,
|
||||
BuildSettingsInfo: config.BuildSettingsInfo,
|
||||
}
|
||||
builSettings, err := buildsettings.CreateBuildSettingsInfo(&npmConfig, "npmExecuteScripts")
|
||||
if err != nil {
|
||||
log.Entry().Warnf("failed to create build settings info : ''%v", err)
|
||||
}
|
||||
commonPipelineEnvironment.custom.buildSettingsInfo = builSettings
|
||||
|
||||
if config.Publish {
|
||||
packageJSONFiles, err := npmExecutor.FindPackageJSONFilesWithExcludes(config.BuildDescriptorExcludeList)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user