Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 26f423a

Browse files
authored
2.11.2 snapshot qualification (#296)
* Fixed issue 281 (#284) * Update the maven release (#286) * [maven-release-plugin] prepare release matlab-2.12.0 * [maven-release-plugin] prepare for next development iteration * Added summary page warnning * Updated summary warnning * Fixed Summary page issues * Fixed issue 292 * Fixed 289 as per comment * Fixed error message issue 288 * Fixed 289
1 parent 6265ee0 commit 26f423a

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath />
99
</parent>
1010
<artifactId>matlab</artifactId>
11-
<version>2.11.2-SNAPSHOT</version>
11+
<version>2.12.1-SNAPSHOT</version>
1212
<packaging>hpi</packaging>
1313
<developers>
1414
<developer>

src/main/java/com/mathworks/ci/BuildTargetNote.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public BuildTargetNote() {
2222
public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
2323
MarkupText.SubText t = text.findToken(Pattern.compile("MATLAB-Build-"));
2424
String taskName = text.subText(13, text.length()-2).getText();
25+
taskName = taskName.replace("]","").trim();
2526
if (t != null)
2627
t.addMarkup(0, t.length()-1, "<a id= matlab" + taskName + " name=matlab" + taskName + ">", "</a>");
2728
return null;

src/main/resources/+ciplugins/+jenkins/BuildReportPlugin.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
function runTaskGraph(plugin, pluginData)
88
[email protected](plugin, pluginData);
9-
fID = fopen('.matlab/buildArtifact.json', 'w');
9+
fID = fopen(fullfile(getenv("WORKSPACE"),'.matlab/buildArtifact.json'), 'w');
1010
taskDetails = struct();
1111
for idx = 1:numel(pluginData.TaskResults)
1212
taskDetails(idx).name = pluginData.TaskResults(idx).Name;

src/main/resources/com/mathworks/ci/BuildArtifactAction/index.jelly

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@
5959
<j:forEach var="p" items="${it.buildArtifact}" varStatus="status">
6060
<tr>
6161
<td class="pane" align="left">
62-
<a href="../console#matlab-${p.taskName}]">${p.taskName}</a>
62+
<a href="../console#matlab-${p.taskName}">${p.taskName}</a>
6363
</td>
6464
<td class="pane" style="width:9em">
6565
<span class="${pst.cssClass}">
6666
<j:if test="${p.taskFailed != false}">
67-
<a href="../console#matlab-${p.taskName}]"><font color="#EF2929"> FAILED </font> </a>
67+
<a href="../console#matlab-${p.taskName}"><font color="#EF2929"> FAILED </font> </a>
6868
</j:if>
6969
<j:if test="${p.taskFailed == false}">
7070
<j:if test="${p.taskSkipped == false}">

src/main/resources/com/mathworks/ci/BuildArtifactAction/summary.jelly

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@
66
xmlns:f="/lib/form"
77
xmlns:i="jelly:fmt">
88
<t:summary icon="document.png">
9-
<p><a href="buildresults">MATLAB Build Results</a></p>
10-
<p>This build report includes <font color="Blue"><b>${it.totalCount} tasks.</b></font></p>
11-
<ol>
12-
<li><p>Number of failed tasks: <font color="red"><b>${it.failCount} </b></font></p></li>
13-
<li><p>Number of skipped tasks: <font color="orange"><b>${it.skipCount} </b></font></p></li>
14-
</ol>
9+
<p><a href="buildresults">MATLAB Build Result</a></p>
10+
<span class="${pst.cssClass}">
11+
<j:if test="${it.totalCount == 0}">
12+
<font color="#EF2929"><h5>Unable to run a MATLAB build. </h5></font>
13+
</j:if>
14+
</span>
15+
<p><b>Tasks run: <font color="Blue">${it.totalCount}</font></b></p>
16+
<br>
17+
<b>Failed: <font color="red">${it.failCount}</font></b>
18+
</br>
19+
<br>
20+
<b>Skipped: <font color="orange">${it.skipCount}</font></b>
21+
</br>
1522
</t:summary>
1623
</j:jelly>

0 commit comments

Comments
 (0)