Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Commit b290fdb

Browse files
committed
Add 'list artifacts' step for debugging. Disable distcheck temporarily
1 parent 53717dd commit b290fdb

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

master/master.cfg

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,11 +1129,11 @@ def distsnap_buildfactory(platform, channel_label):
11291129
elif 'cross' in platform:
11301130
command.append('dist')
11311131
else:
1132-
command.append('distcheck')
1132+
command.append('dist') # FIXME (brson) distcheck takes too long as formulated
11331133
# Don't run check because distcheck is going to do it all again
11341134
f = make_and_check_buildfactory(False, False, "win" in platform, False)
11351135
f.addStep(Compile(env=CommandEnv(),
1136-
name='distcheck',
1136+
name='dist-not-check',
11371137
command=command,
11381138
timeout=compile_timeout,
11391139
interruptSignal="TERM",
@@ -1164,6 +1164,11 @@ def distsnap_buildfactory(platform, channel_label):
11641164

11651165
# All remaining steps happen on the buildmaster
11661166

1167+
# List the files we just got
1168+
ls_cmd = "ls " + local_dist_platform_dir
1169+
f.addStep(MasterShellCommand(name="list artifacts",
1170+
command=["sh", "-c", ls_cmd]))
1171+
11671172
# If we're not packaging as well then this platform is just producing std or
11681173
# cross artifacts, so delete everything related to the host platform.
11691174
if platform not in packaging_platforms:
@@ -1174,6 +1179,11 @@ def distsnap_buildfactory(platform, channel_label):
11741179
f.addStep(MasterShellCommand(name="remove " + host + " artifacts",
11751180
command=["sh", "-c", clean_cmd]))
11761181

1182+
# List the files we still got
1183+
ls_cmd = "ls " + local_dist_platform_dir
1184+
f.addStep(MasterShellCommand(name="list artifacts",
1185+
command=["sh", "-c", ls_cmd]))
1186+
11771187
# Add the commit-id file to indicate which commit this is
11781188
# for. This will be checked by the DistSync buildstep later to
11791189
# determine when to upload everything at once.

0 commit comments

Comments
 (0)