diff --git a/CHANGELOG.md b/CHANGELOG.md index c3c709773..fbe927441 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Note: Can be used with `sfdx plugins:install sfdx-hardis@beta` and docker image `hardisgroupcom/sfdx-hardis@beta` +## [5.0.3] 2024-09-23 + +- Add --ignore-conflicts to smartDeploy + ## [5.0.2] 2024-09-23 - Always use `project deploy start --dry-run` for deployment validation, until command `project deploy validate` works with --ignore-warnings & NoTestRun diff --git a/package.json b/package.json index 35346a81f..6c2067c20 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Swiss-army-knife Toolbox for Salesforce.\n Allows you to define a complete CD/CD Pipeline.\n Orchestrate base commands and assist users with interactive wizards", "author": "NicolasVuillamy @nvuillam", "bugs": "https://github.com/hardisgroupcom/sfdx-hardis/issues", - "version": "5.0.2", + "version": "5.0.3", "dependencies": { "@actions/github": "^6.0.0", "@gitbeaker/node": "^35.8.1", diff --git a/src/common/utils/deployUtils.ts b/src/common/utils/deployUtils.ts index bea4e025d..b65ee73bc 100644 --- a/src/common/utils/deployUtils.ts +++ b/src/common/utils/deployUtils.ts @@ -285,6 +285,7 @@ export async function smartDeploy( (check ? ' --dry-run' : '') + ` --manifest "${deployment.packageXmlFile}"` + ' --ignore-warnings' + // So it does not fail in for objectTranslations stuff for example + ' --ignore-conflicts' + // With CICD we are supposed to ignore them ` --test-level ${testlevel}` + (options.testClasses && testlevel !== 'NoTestRun' ? ` --tests ${options.testClasses}` : '') + (options.preDestructiveChanges ? ` --pre-destructive-changes ${options.preDestructiveChanges}` : '') +