Skip to content

Commit

Permalink
(PA-6543) Add more curl options when downloading WIX zip
Browse files Browse the repository at this point in the history
 - 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.
  • Loading branch information
shubhamshinde360 committed Sep 13, 2024
1 parent 595dbc2 commit f3cc72f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configs/platforms/windowsfips-2012r2-x64.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#FIXME we need Fips Compliant Wix, currently not in choco repositories
#plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y Wix310 -version 3.10.2 -debug -x86 --no-progress"
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"
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"

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

Expand Down

0 comments on commit f3cc72f

Please sign in to comment.