Page MenuHomePhorge
Files F29511931

D247.1768022576.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D247.1768022576.diff
View Options

diff --git a/lilybuild/lilybuild/ci_steps.py b/lilybuild/lilybuild/ci_steps.py
--- a/lilybuild/lilybuild/ci_steps.py
+++ b/lilybuild/lilybuild/ci_steps.py
@@ -96,7 +96,7 @@
self.addCompleteLog('exception', f'{e}')
return res
- def get_upload_artifacts_jobs(self, short_name, artifact_type, artifact_name, base_dir, paths, exclude, master_pattern, job_index, doStepIf=on_success):
+ def get_upload_artifacts_jobs(self, short_name, artifact_type, artifact_name, base_dir, paths, exclude, master_pattern, job_index, doStepIf=on_success, has_pages=False):
archive_artifact_step = steps.ShellCommand(
name=f'Archive artifacts: {short_name}',
command=[
@@ -129,7 +129,23 @@
url=artifact_url,
doStepIf=doStepIf,
)
- return [archive_artifact_step, upload_artifact_step]
+ r = [archive_artifact_step, upload_artifact_step]
+ if has_pages:
+ r.append(steps.MasterShellCommand(
+ command=util.Transform(fill_list,
+ sys.executable,
+ '-m', 'lilybuild.pages',
+ util.Interpolate(
+ self.master_pages_dir_pattern,
+ st=self.storage_dir,
+ ),
+ masterdest,
+ ),
+ name='Deploy pages',
+ logEnviron=False,
+ doStepIf=doStepIf,
+ ))
+ return r
@defer.inlineCallbacks
def job_to_steps(self, job, job_index):
@@ -217,7 +233,8 @@
job.artifacts.get('paths', []),
job.artifacts.get('exclude', []),
self.master_job_artifact_file_name_pattern,
- job_index
+ job_index,
+ has_pages=self.is_pages()
)
if job.has_supported_coverage_report():
steps_to_run += [steps.ShellCommand(
@@ -264,23 +281,6 @@
)
steps_to_run.append(clean_stage_dir_again_step)
- if job.is_pages() and 'paths' in job.artifacts:
- deploy_pages_step = steps.MasterShellCommand(
- command=util.Transform(fill_list,
- sys.executable,
- '-m', 'lilybuild.pages',
- util.Interpolate(
- self.master_pages_dir_pattern,
- st=self.storage_dir,
- ),
- masterdest,
- ),
- name='Deploy pages',
- logEnviron=False,
- doStepIf=on_success,
- )
- steps_to_run.append(deploy_pages_step)
-
return steps_to_run
class TriggerMultipleJobsStep(steps.Trigger):

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 9, 9:22 PM (2 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
937694
Default Alt Text
D247.1768022576.diff (2 KB)

Event Timeline