Skip to content

Commit aec274d

Browse files
MDBF-1197: temporary windows msi builder hotfix regarding HeidiSQL download
windows-packages builder failing with: ``` -- Downloading https://www.heidisql.com/downloads/releases/HeidiSQL_12.14_64_Portable.zip to C:/buildbot/workers/prod/amd64-windows-packages/build/tmpdir/HeidiSQL_12.14_64_Portable/HeidiSQL_12.14_64_Portable.zip cmake -E tar : error : ZIP decompression failed (-5) [C:\buildbot\workers\prod\amd64-windows-packages\build\win\packaging\MSI.vcxproj] ``` Because a file download 60 seconds timeout is reached in https://github.com/MariaDB/server/blob/9fc925d77163f1d63e21a65654b0f59678abf08d/win/packaging/heidisql.cmake#L9 The file download status if not checked in cmake, it will be silently ignored and cmake continues to decompression, resulting in the above error, due to an incomplete download. CMAKE is looking in TEMP for third parties, setting: THIRD_PARTY_DOWNLOAD_LOCATION https://github.com/MariaDB/server/blob/9fc925d77163f1d63e21a65654b0f59678abf08d/win/packaging/CMakeLists.txt#L139 But currently TEMP is set to a worker path build location that is removed on every run. WVlad will permanetly fix this by making THIRD_PARTY_DOWNLOAD_LOCATION settable in 10.6 and also increasing the timeout. Until then, I manually copied `HeidiSQL_12.14_64_Portable.zip` on the system and user TEMP location on the windows packages host, and will remove the TEMP env variable from the configuration, letting the system / user variable take precedence.
1 parent e90e567 commit aec274d

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

master-nonlatent/master.cfg

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,16 @@ F_WINDOWS_ENV = {
140140
}
141141
F_WINDOWS_ENV.update(MTR_ENV)
142142

143+
F_WINDOWS_ENV_WITHOUT_TEMP = {
144+
"TMP": util.Interpolate(
145+
"C:\\buildbot\\workers\\{0}\\%(prop:buildername)s\\build\\tmpdir".format(
146+
"dev" if os.environ["ENVIRON"] == "DEV" else "prod"
147+
)
148+
),
149+
}
150+
151+
F_WINDOWS_ENV_WITHOUT_TEMP.update(MTR_ENV)
152+
143153
## f_windows
144154
f_windows = util.BuildFactory()
145155
f_windows.addStep(
@@ -374,7 +384,7 @@ f_windows_msi.addStep(
374384
f_windows_msi.addStep(
375385
steps.Compile(
376386
name="cmake",
377-
env=F_WINDOWS_ENV,
387+
env=F_WINDOWS_ENV_WITHOUT_TEMP,
378388
command=[
379389
"dojob",
380390
'"',
@@ -403,7 +413,7 @@ f_windows_msi.addStep(
403413
f_windows_msi.addStep(
404414
steps.Compile(
405415
name="compile",
406-
env=F_WINDOWS_ENV,
416+
env=F_WINDOWS_ENV_WITHOUT_TEMP,
407417
command=[
408418
"dojob",
409419
'"',
@@ -420,7 +430,7 @@ f_windows_msi.addStep(
420430
f_windows_msi.addStep(
421431
steps.Compile(
422432
name="package",
423-
env=F_WINDOWS_ENV,
433+
env=F_WINDOWS_ENV_WITHOUT_TEMP,
424434
command=[
425435
"dojob",
426436
'"',

0 commit comments

Comments
 (0)