@silexlabs/silex 3.0.0-alpha.157 → 3.0.0-alpha.159

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -517,6 +517,7 @@ class FtpConnector {
517
517
  await this.mkdir(ftp, (0, path_1.join)(rootPath, this.options.assetsFolder));
518
518
  await this.mkdir(ftp, (0, path_1.join)(rootPath, this.options.cssFolder));
519
519
  // Write files
520
+ // Do not await for the result, return the job and continue the publication in the background
520
521
  this.writeFile(session, '', files, '', async ({ status, message }) => {
521
522
  // Update the job status
522
523
  job.status = status;
@@ -1 +1 @@
1
- {"version":3,"file":"FtpConnector.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/FtpConnector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FtpConnector.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/FtpConnector.ts"],"names":[],"mappings":"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"}
@@ -15,5 +15,8 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
15
15
  constructor(config: ServerConfig, opts: Partial<GitlabOptions>);
16
16
  publish(session: GitlabSession, websiteId: WebsiteId, files: ConnectorFile[], { startJob, jobSuccess, jobError }: JobManager): Promise<JobData>;
17
17
  getUrl(session: GitlabSession, websiteId: WebsiteId): Promise<string>;
18
+ getAdminUrl(session: GitlabSession, websiteId: WebsiteId): Promise<string>;
19
+ getPageUrl(session: GitlabSession, websiteId: WebsiteId, projectUrl: string): Promise<string>;
20
+ getGitlabJobLogsUrl(session: GitlabSession, websiteId: WebsiteId, projectUrl: string): Promise<string>;
18
21
  createTag(session: GitlabSession, websiteId: WebsiteId, job: JobData, { startJob, jobSuccess, jobError }: JobManager): Promise<boolean>;
19
22
  }
@@ -32,7 +32,7 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
32
32
  connectorType = types_1.ConnectorType.HOSTING;
33
33
  constructor(config, opts) {
34
34
  super(config, opts);
35
- /* public directory for standard gitlab pages */
35
+ // public directory for standard gitlab pages
36
36
  this.options.assetsFolder = 'public';
37
37
  }
38
38
  async publish(session, websiteId, files, { startJob, jobSuccess, jobError }) {
@@ -69,31 +69,61 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
69
69
  jobError(job.jobId, e.message);
70
70
  }
71
71
  }
72
- // From here we will return the job and continue the publication in the background
73
- /* publishing all files for website*/
72
+ // publishing all files for website
73
+ // Do not await for the result, return the job and continue the publication in the background
74
74
  this.writeAssets(session, websiteId, files, async ({ status, message }) => {
75
75
  // Update the job status
76
76
  if (status === types_1.JobStatus.SUCCESS) {
77
77
  /* Squash and tag the commits */
78
78
  const succes = await this.createTag(session, websiteId, job, { startJob, jobSuccess, jobError });
79
- if (succes) {
79
+ if (!succes) {
80
+ // jobError will have been called in createTag
81
+ return;
82
+ }
83
+ try {
84
+ job.message = 'Getting the website URL...';
85
+ job.logs[0].push(job.message);
80
86
  const gitlabUrl = await this.getUrl(session, websiteId);
81
- job.message = gitlabUrl;
82
- job.logs[0].push(gitlabUrl);
83
- jobSuccess(job.jobId, 'Gitlab pages PUBLISHED: ' + '<a href="' + gitlabUrl + '" target="_blank">' + gitlabUrl + '</a>');
87
+ job.logs[0].push(`Website URL: ${gitlabUrl}`);
88
+ job.message = 'Getting the admin URL...';
89
+ job.logs[0].push(job.message);
90
+ const adminUrl = await this.getAdminUrl(session, websiteId);
91
+ job.logs[0].push(`Admin URL: ${adminUrl}`);
92
+ job.message = 'Getting the page URL...';
93
+ job.logs[0].push(job.message);
94
+ const pageUrl = await this.getPageUrl(session, websiteId, adminUrl);
95
+ job.logs[0].push(`Page URL: ${pageUrl}`);
96
+ job.message = 'Getting the deployment logs URL...';
97
+ job.logs[0].push(job.message);
98
+ const gitlabJobLogsUrl = await this.getGitlabJobLogsUrl(session, websiteId, adminUrl);
99
+ job.logs[0].push(`Deployment logs URL: ${gitlabJobLogsUrl}`);
100
+ const message = `
101
+ <p><a href="${gitlabUrl}" target="_blank">Your website is now live here</a>.</p>
102
+ <p>Changes may take a few minutes to appear, <a href="${gitlabJobLogsUrl}" target="_blank">follow deployment here</a>.</p>
103
+ <p>Manage <a href="${pageUrl}" target="_blank">GitLab Pages settings</a>.</p>
104
+ `;
105
+ job.logs[0].push(message);
106
+ jobSuccess(job.jobId, message);
84
107
  }
85
- else {
86
- // jobError will have been called in createTag
108
+ catch (error) {
109
+ console.error('Error during getting the website URLs:', error.message);
110
+ jobError(job.jobId, `Failed to get the website URLs: ${error.message}`);
87
111
  }
88
112
  }
89
113
  else if (status === types_1.JobStatus.ERROR) {
90
114
  job.errors[0].push(message);
91
115
  jobError(job.jobId, message);
92
116
  }
93
- // Update the job status AFTER it has create the tag
94
- job.status = status;
95
- job.message = message;
96
- job.logs[0].push(message);
117
+ else {
118
+ // Update the job status while uploading files
119
+ job.status = status;
120
+ job.message = message;
121
+ job.logs[0].push(message);
122
+ }
123
+ })
124
+ .catch(e => {
125
+ console.error('Error uploading files to gitlab:', e.message);
126
+ jobError(job.jobId, `Failed to upload files: ${e.message}`);
97
127
  });
98
128
  return job;
99
129
  }
@@ -102,6 +132,17 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
102
132
  const response = await this.callApi(session, `api/v4/projects/${websiteId}/pages`, 'GET');
103
133
  return response.url;
104
134
  }
135
+ async getAdminUrl(session, websiteId) {
136
+ const projectInfo = await this.callApi(session, `api/v4/projects/${websiteId}`, 'GET');
137
+ return projectInfo.web_url;
138
+ }
139
+ async getPageUrl(session, websiteId, projectUrl) {
140
+ return `${projectUrl}/pages`;
141
+ }
142
+ async getGitlabJobLogsUrl(session, websiteId, projectUrl) {
143
+ const jobs = await this.callApi(session, `api/v4/projects/${websiteId}/jobs`, 'GET');
144
+ return `${projectUrl}/-/jobs/${jobs[0].id}`;
145
+ }
105
146
  async createTag(session, websiteId, job, { startJob, jobSuccess, jobError }) {
106
147
  const projectId = websiteId; // Assuming websiteId corresponds to GitLab project ID
107
148
  // Fetch the latest tag and determine the new tag
@@ -109,13 +150,10 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
109
150
  try {
110
151
  job.message = 'Fetching latest tag and commits...';
111
152
  // Fetch the latest tag
112
- tags = await this.callApi(session, `api/v4/projects/${projectId}/repository/tags`, 'GET', {
113
- per_page: 1,
114
- });
153
+ tags = await this.callApi(session, `api/v4/projects/${projectId}/repository/tags`, 'GET');
115
154
  const latestTag = tags[0]?.name || 'v0.0.0';
116
155
  const [major, minor, patch] = latestTag.slice(1).split('.').map(Number);
117
- // Increment the minor version
118
- newTag = `v${major}.${minor + 1}.${patch}`;
156
+ newTag = `v${major}.${minor}.${patch + 1}`;
119
157
  }
120
158
  catch (error) {
121
159
  console.error('Error during fetching latest tag:', error.message);
@@ -1 +1 @@
1
- {"version":3,"file":"GitlabHostingConnector.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/GitlabHostingConnector.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;AAEH;;;;;GAKG;AAEH,wEAAgF;AAEhF,uCAA8F;AAM9F,MAAqB,sBAAuB,SAAQ,yBAAe;IAEjE,WAAW,GAAG,gBAAgB,CAAA;IAC9B,aAAa,GAAG,qBAAa,CAAC,OAAO,CAAA;IAErC,YAAa,MAAoB,EAAE,IAA4B;QAC7D,KAAK,CAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACpB,gDAAgD;QAChD,IAAI,CAAC,OAAO,CAAC,YAAY,GAAE,QAAQ,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAsB,EAAE,SAAoB,EAAE,KAAsB,EAAE,EAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAa;QAC9H,MAAM,GAAG,GAAG,QAAQ,CAAC,iBAAiB,IAAI,CAAC,WAAW,EAAE,CAAuB,CAAA;QAC/E,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,iBAAiB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;QAClD,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAA;QACjB,oFAAoF;QACpF,MAAM,OAAO,GAAG,gBAAgB,CAAA;QAChC,MAAM,UAAU,GAAG;;;;;eAKR,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;;;2CAG3B,CAAE,CAAC,CAAC;4DACa;;;;;;KAMvD,CAAA;QACD,IAAI;YACF,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;SACjD;QAAC,OAAO,CAAC,EAAE;YACV,+GAA+G;YAC/G,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,cAAc,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,sCAAsC,CAAC,EAAE;gBAClH,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;aAC/D;iBAAM;gBACL,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;aAC/B;SACF;QAED,kFAAkF;QAElF,qCAAqC;QACrC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,EAAE;YACtE,wBAAwB;YACxB,IAAG,MAAM,KAAK,iBAAS,CAAC,OAAO,EAAE;gBAC/B,gCAAgC;gBAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAA;gBAChG,IAAG,MAAM,EAAE;oBACT,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;oBACvD,GAAG,CAAC,OAAO,GAAG,SAAS,CAAA;oBACvB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC3B,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,0BAA0B,GAAG,WAAW,GAAG,SAAS,GAAG,oBAAoB,GAAG,SAAS,GAAG,MAAM,CAAC,CAAA;iBACxH;qBAAM;oBACL,8CAA8C;iBAC/C;aACF;iBAAM,IAAG,MAAM,KAAK,iBAAS,CAAC,KAAK,EAAE;gBACpC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC3B,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;aAC7B;YACD,oDAAoD;YACpD,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;YACnB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;YACrB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,qCAAqC;IACrC,KAAK,CAAC,MAAM,CAAC,OAAsB,EAAE,SAAoB;QACvD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,SAAS,QAAQ,EAAE,KAAK,CAAC,CAAA;QACzF,OAAO,QAAQ,CAAC,GAAG,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAsB,EAAE,SAAoB,EAAE,GAAY,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAc;QACxH,MAAM,SAAS,GAAG,SAAS,CAAA,CAAC,sDAAsD;QAElF,iDAAiD;QACjD,IAAI,MAAM,EAAE,IAAI,CAAA;QAChB,IAAI;YACF,GAAG,CAAC,OAAO,GAAG,oCAAoC,CAAA;YAClD,uBAAuB;YACvB,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,SAAS,kBAAkB,EAAE,KAAK,EAAE;gBACxF,QAAQ,EAAE,CAAC;aACZ,CAAC,CAAA;YACF,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,QAAQ,CAAA;YAC3C,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACvE,8BAA8B;YAC9B,MAAM,GAAG,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,EAAE,CAAA;SAC3C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;YACjE,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,+BAA+B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YACnE,OAAO,KAAK,CAAA;SACb;QAED,mBAAmB;QACnB,IAAI;YACF,GAAG,CAAC,OAAO,GAAG,oBAAoB,MAAM,KAAK,CAAA;YAC7C,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,SAAS,kBAAkB,EAAE,MAAM,EAAE;gBAClF,QAAQ,EAAE,MAAM;gBAChB,GAAG,EAAE,MAAM;gBACX,OAAO,EAAE,wBAAwB;aAClC,CAAC,CAAA;SACH;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;YAC9D,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YACjE,OAAO,KAAK,CAAA;SACb;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CAEF;AApHD,yCAoHC"}
1
+ {"version":3,"file":"GitlabHostingConnector.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/GitlabHostingConnector.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@silexlabs/silex",
3
3
  "description": "Free and easy website builder for everyone.",
4
- "version": "3.0.0-alpha.157",
4
+ "version": "3.0.0-alpha.159",
5
5
  "version:backwardcompat": "3.0.0",
6
6
  "author": {
7
7
  "name": "Alex Hoyau",
@@ -604,6 +604,7 @@ export default class FtpConnector implements StorageConnector<FtpSession> {
604
604
  await this.mkdir(ftp, join(rootPath, this.options.assetsFolder))
605
605
  await this.mkdir(ftp, join(rootPath, this.options.cssFolder))
606
606
  // Write files
607
+ // Do not await for the result, return the job and continue the publication in the background
607
608
  this.writeFile(session, '', files, '', async ({status, message}) => {
608
609
  // Update the job status
609
610
  job.status = status
@@ -37,7 +37,7 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
37
37
 
38
38
  constructor( config: ServerConfig, opts: Partial<GitlabOptions>) {
39
39
  super (config, opts)
40
- /* public directory for standard gitlab pages */
40
+ // public directory for standard gitlab pages
41
41
  this.options.assetsFolder= 'public'
42
42
  }
43
43
 
@@ -74,31 +74,59 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
74
74
  }
75
75
  }
76
76
 
77
- // From here we will return the job and continue the publication in the background
78
-
79
- /* publishing all files for website*/
77
+ // publishing all files for website
78
+ // Do not await for the result, return the job and continue the publication in the background
80
79
  this.writeAssets(session, websiteId, files, async ({status, message}) => {
81
80
  // Update the job status
82
81
  if(status === JobStatus.SUCCESS) {
83
82
  /* Squash and tag the commits */
84
83
  const succes = await this.createTag(session, websiteId, job, { startJob, jobSuccess, jobError })
85
- if(succes) {
86
- const gitlabUrl = await this.getUrl(session, websiteId)
87
- job.message = gitlabUrl
88
- job.logs[0].push(gitlabUrl)
89
- jobSuccess(job.jobId, 'Gitlab pages PUBLISHED: ' + '<a href="' + gitlabUrl + '" target="_blank">' + gitlabUrl + '</a>')
90
- } else {
84
+ if(!succes) {
91
85
  // jobError will have been called in createTag
86
+ return
87
+ }
88
+ try {
89
+ job.message = 'Getting the website URL...'
90
+ job.logs[0].push(job.message)
91
+ const gitlabUrl = await this.getUrl(session, websiteId)
92
+ job.logs[0].push(`Website URL: ${gitlabUrl}`)
93
+ job.message = 'Getting the admin URL...'
94
+ job.logs[0].push(job.message)
95
+ const adminUrl = await this.getAdminUrl(session, websiteId)
96
+ job.logs[0].push(`Admin URL: ${adminUrl}`)
97
+ job.message = 'Getting the page URL...'
98
+ job.logs[0].push(job.message)
99
+ const pageUrl = await this.getPageUrl(session, websiteId, adminUrl)
100
+ job.logs[0].push(`Page URL: ${pageUrl}`)
101
+ job.message = 'Getting the deployment logs URL...'
102
+ job.logs[0].push(job.message)
103
+ const gitlabJobLogsUrl = await this.getGitlabJobLogsUrl(session, websiteId, adminUrl)
104
+ job.logs[0].push(`Deployment logs URL: ${gitlabJobLogsUrl}`)
105
+ const message = `
106
+ <p><a href="${gitlabUrl}" target="_blank">Your website is now live here</a>.</p>
107
+ <p>Changes may take a few minutes to appear, <a href="${gitlabJobLogsUrl}" target="_blank">follow deployment here</a>.</p>
108
+ <p>Manage <a href="${pageUrl}" target="_blank">GitLab Pages settings</a>.</p>
109
+ `
110
+ job.logs[0].push(message)
111
+ jobSuccess(job.jobId, message)
112
+ } catch (error) {
113
+ console.error('Error during getting the website URLs:', error.message)
114
+ jobError(job.jobId, `Failed to get the website URLs: ${error.message}`)
92
115
  }
93
116
  } else if(status === JobStatus.ERROR) {
94
117
  job.errors[0].push(message)
95
118
  jobError(job.jobId, message)
119
+ } else {
120
+ // Update the job status while uploading files
121
+ job.status = status
122
+ job.message = message
123
+ job.logs[0].push(message)
96
124
  }
97
- // Update the job status AFTER it has create the tag
98
- job.status = status
99
- job.message = message
100
- job.logs[0].push(message)
101
125
  })
126
+ .catch(e => {
127
+ console.error('Error uploading files to gitlab:', e.message)
128
+ jobError(job.jobId, `Failed to upload files: ${e.message}`)
129
+ })
102
130
 
103
131
  return job
104
132
  }
@@ -109,6 +137,20 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
109
137
  return response.url
110
138
  }
111
139
 
140
+ async getAdminUrl(session: GitlabSession, websiteId: WebsiteId): Promise<string> {
141
+ const projectInfo = await this.callApi(session, `api/v4/projects/${websiteId}`, 'GET')
142
+ return projectInfo.web_url
143
+ }
144
+
145
+ async getPageUrl(session: GitlabSession, websiteId: WebsiteId, projectUrl: string): Promise<string> {
146
+ return `${projectUrl}/pages`
147
+ }
148
+
149
+ async getGitlabJobLogsUrl(session: GitlabSession, websiteId: WebsiteId, projectUrl: string): Promise<string> {
150
+ const jobs = await this.callApi(session, `api/v4/projects/${websiteId}/jobs`, 'GET')
151
+ return `${projectUrl}/-/jobs/${jobs[0].id}`
152
+ }
153
+
112
154
  async createTag(session: GitlabSession, websiteId: WebsiteId, job: JobData, { startJob, jobSuccess, jobError }: JobManager): Promise<boolean> {
113
155
  const projectId = websiteId // Assuming websiteId corresponds to GitLab project ID
114
156
 
@@ -117,13 +159,10 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
117
159
  try {
118
160
  job.message = 'Fetching latest tag and commits...'
119
161
  // Fetch the latest tag
120
- tags = await this.callApi(session, `api/v4/projects/${projectId}/repository/tags`, 'GET', {
121
- per_page: 1,
122
- })
162
+ tags = await this.callApi(session, `api/v4/projects/${projectId}/repository/tags`, 'GET')
123
163
  const latestTag = tags[0]?.name || 'v0.0.0'
124
164
  const [major, minor, patch] = latestTag.slice(1).split('.').map(Number)
125
- // Increment the minor version
126
- newTag = `v${major}.${minor + 1}.${patch}`
165
+ newTag = `v${major}.${minor}.${patch + 1}`
127
166
  } catch (error) {
128
167
  console.error('Error during fetching latest tag:', error.message)
129
168
  jobError(job.jobId, `Failed to fetch latest tag: ${error.message}`)