Skip to content

Commit f3cc72f

Browse files
(PA-6543) Add more curl options when downloading WIX zip
- The '--fail' options will return error code 1 if artifactory resource is not found. If not given, then for unsuccessful response from artifactory, the response is saved in the output file as html. Here, curl returns exit code 0 which is not interpreted as an error, so the build proceeds. The build then tries to unzip this html which throws an error that is rather difficult to debug. - The '--retry' flag will guard against transient failures if any.
1 parent 595dbc2 commit f3cc72f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

configs/platforms/windowsfips-2012r2-x64.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#FIXME we need Fips Compliant Wix, currently not in choco repositories
1616
#plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y Wix310 -version 3.10.2 -debug -x86 --no-progress"
17-
plat.provision_with "curl -L -o /tmp/wix314-binaries.zip https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/wix314-binaries.zip && \"C:/Program Files/7-Zip/7z.exe\" x -y -o\"C:/Program Files (x86)/WiX Toolset v3.14/bin\" C:/cygwin64/tmp/wix314-binaries.zip && rm /tmp/wix314-binaries.zip && SETX WIX \"C:\\Program Files (x86)\\WiX Toolset v3.14\" /M"
17+
plat.provision_with "curl -L --fail --retry 3 -o /tmp/wix314-binaries.zip https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/wix314-binaries.zip && \"C:/Program Files/7-Zip/7z.exe\" x -y -o\"C:/Program Files (x86)/WiX Toolset v3.14/bin\" C:/cygwin64/tmp/wix314-binaries.zip && rm /tmp/wix314-binaries.zip && SETX WIX \"C:\\Program Files (x86)\\WiX Toolset v3.14\" /M"
1818

1919
plat.install_build_dependencies_with "C:/ProgramData/chocolatey/bin/choco.exe install -y --no-progress"
2020

0 commit comments

Comments
 (0)