You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2025/02/27 12:54:27 UTC
(couchdb-glazier) 01/01: Skippable MSI/MSM validation checks
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch skippable-msi-validation
in repository https://gitbox.apache.org/repos/asf/couchdb-glazier.git
commit f5af96183b73a51d58f9ba8d175c2a0feaf2c21b
Author: Ronny Berndt <ro...@apache.org>
AuthorDate: Thu Feb 27 13:49:18 2025 +0100
Skippable MSI/MSM validation checks
When running the build installer script from Jenkins, it isn't
possible to run the msi/msm validation checks through multiple
hardcoded restriction in wix [1].
Introduce the skipping of the checks via a command parameter option.
[1] https://docs.firegiant.com/wix/tools/validation/#errors-running-validation
---
bin/build_installer.ps1 | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/bin/build_installer.ps1 b/bin/build_installer.ps1
index b6d81ba..2090171 100644
--- a/bin/build_installer.ps1
+++ b/bin/build_installer.ps1
@@ -17,8 +17,9 @@
.DESCRIPTION
This command creates the Windows installer file
- -IncludeGitSha Append revision to the Windows installer file
-Path <string> Path to the CouchDB source tree directory
+ -IncludeGitSha Append revision to the Windows installer file
+ -DisableICEChecks Suppress MSI/MSM validation (Use only in CI)
.LINK
https://couchdb.apache.org/
@@ -30,7 +31,8 @@ param(
[ValidateNotNullOrEmpty()]
[string]$Path,
- [switch]$IncludeGitSha = $false #include git sha in msi file name
+ [switch]$IncludeGitSha = $false, # include git sha in msi file name
+ [switch]$DisableICEChecks = $false # disable msi validation checks in CI runs
)
# Example:
@@ -116,7 +118,12 @@ candle -arch x64 -ext WiXUtilExtension adminprompt.wxs
candle -arch x64 -ext WiXUtilExtension cookieprompt.wxs
candle -arch x64 -ext WiXUtilExtension customexit.wxs
candle -arch x64 -ext WiXUtilExtension CouchInstallDirDlg.wxs
-light -sw1076 -sice:ICE17 -ext WixUIExtension -ext WiXUtilExtension "-cultures:en-us;en;neutral" adminprompt.wixobj cookieprompt.wixobj couchdb.wixobj couchdbfiles.wixobj couchdb_wixui.wixobj customexit.wixobj CouchInstallDirDlg.wixobj -out apache-couchdb-${CouchDBVersion}.msi
+
+if($DisableICEChecks) {
+ light -sval -sw1076 -sice:ICE17 -ext WixUIExtension -ext WiXUtilExtension "-cultures:en-us;en;neutral" adminprompt.wixobj cookieprompt.wixobj couchdb.wixobj couchdbfiles.wixobj couchdb_wixui.wixobj customexit.wixobj CouchInstallDirDlg.wixobj -out apache-couchdb-${CouchDBVersion}.msi
+} else {
+ light -sw1076 -sice:ICE17 -ext WixUIExtension -ext WiXUtilExtension "-cultures:en-us;en;neutral" adminprompt.wixobj cookieprompt.wixobj couchdb.wixobj couchdbfiles.wixobj couchdb_wixui.wixobj customexit.wixobj CouchInstallDirDlg.wixobj -out apache-couchdb-${CouchDBVersion}.msi
+}
Pop-Location