Skip to content

Commit 633d6aa

Browse files
monty-botmonty-bot
committed
🚀 releasing version 2.6.0 @ 2021-08-24 12:43
[skip ci]
1 parent b0d8d4e commit 633d6aa

File tree

12 files changed

+128
-9
lines changed

12 files changed

+128
-9
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ This project was forked from version 1.7.4 of [mbed-tools-ci-scripts](https://gi
1717

1818
[//]: # (begin_release_notes)
1919

20+
"2.6.0" (2021-08-24)"2.6.0" (2021-08-24)
21+
====================
22+
23+
Features
24+
--------
25+
26+
- Added a clean repository step (#202108241231)
27+
28+
2029
"2.5.1" (2021-08-24)"2.5.1" (2021-08-24)
2130
====================
2231

‎continuous_delivery_scripts/_version.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
1111
This file is autogenerated, do not modify by hand.
1212
"""
13-
__version__ = "2.5.1"
14-
COMMIT = "6d78a8e03c5e3051eeea2b276f6f59f5d01ed7e3"
13+
__version__ = "2.6.0"
14+
COMMIT = "b0d8d4eb11bf92fac92b5040a047e2f1f7fbfa2f"
1515
MAJOR = 2
16-
MINOR = 5
17-
PATCH = 1
16+
MINOR = 6
17+
PATCH = 0

‎docs/plugins/docker.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ <h3>Inherited members</h3>
242242
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_code_documentation" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_code_documentation">generate_code_documentation</a></code></li>
243243
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_source_licence_header_template" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_source_licence_header_template">generate_source_licence_header_template</a></code></li>
244244
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.get_version_tag" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.get_version_tag">get_version_tag</a></code></li>
245+
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_include_spdx_in_package" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_include_spdx_in_package">should_include_spdx_in_package</a></code></li>
245246
</ul>
246247
</li>
247248
</ul>

‎docs/plugins/golang.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ <h3>Inherited members</h3>
339339
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.can_get_project_metadata" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.can_get_project_metadata">can_get_project_metadata</a></code></li>
340340
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_code_documentation" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_code_documentation">generate_code_documentation</a></code></li>
341341
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_source_licence_header_template" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_source_licence_header_template">generate_source_licence_header_template</a></code></li>
342+
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_include_spdx_in_package" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_include_spdx_in_package">should_include_spdx_in_package</a></code></li>
342343
</ul>
343344
</li>
344345
</ul>

‎docs/plugins/noop.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ <h3>Inherited members</h3>
264264
<ul class="hlist">
265265
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_source_licence_header_template" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_source_licence_header_template">generate_source_licence_header_template</a></code></li>
266266
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.get_version_tag" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.get_version_tag">get_version_tag</a></code></li>
267+
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_include_spdx_in_package" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_include_spdx_in_package">should_include_spdx_in_package</a></code></li>
267268
</ul>
268269
</li>
269270
</ul>

‎docs/plugins/python.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ <h1 class="title">Module <code>continuous_delivery_scripts.plugins.python</code>
198198
&#34;&#34;&#34;States whether project metadata can be retrieved.&#34;&#34;&#34;
199199
return True
200200

201+
def should_include_spdx_in_package(self) -&gt; bool:
202+
&#34;&#34;&#34;States whether the SPDX documents should be included in the package.&#34;&#34;&#34;
203+
return True
204+
201205
def get_current_spdx_project(self) -&gt; Optional[SpdxProject]:
202206
&#34;&#34;&#34;Gets the current SPDX description.&#34;&#34;&#34;
203207
return _get_current_spdx_project()</code></pre>
@@ -259,6 +263,10 @@ <h2 class="section-title" id="header-classes">Classes</h2>
259263
&#34;&#34;&#34;States whether project metadata can be retrieved.&#34;&#34;&#34;
260264
return True
261265

266+
def should_include_spdx_in_package(self) -&gt; bool:
267+
&#34;&#34;&#34;States whether the SPDX documents should be included in the package.&#34;&#34;&#34;
268+
return True
269+
262270
def get_current_spdx_project(self) -&gt; Optional[SpdxProject]:
263271
&#34;&#34;&#34;Gets the current SPDX description.&#34;&#34;&#34;
264272
return _get_current_spdx_project()</code></pre>
@@ -383,6 +391,7 @@ <h3>Inherited members</h3>
383391
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.can_get_project_metadata" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.can_get_project_metadata">can_get_project_metadata</a></code></li>
384392
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_source_licence_header_template" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.generate_source_licence_header_template">generate_source_licence_header_template</a></code></li>
385393
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.get_version_tag" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.get_version_tag">get_version_tag</a></code></li>
394+
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_include_spdx_in_package" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_include_spdx_in_package">should_include_spdx_in_package</a></code></li>
386395
</ul>
387396
</li>
388397
</ul>

‎docs/tag_and_release.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ <h1 class="title">Module <code>continuous_delivery_scripts.tag_and_release</code
8383
insert_licence_header(0)
8484
_update_repository(mode, is_new_version, version, current_branch)
8585
if is_new_version:
86-
if spdx_project:
86+
if spdx_project and get_language_specifics().should_include_spdx_in_package():
8787
_generate_spdx_reports(spdx_project)
8888
get_language_specifics().package_software(version)
8989
get_language_specifics().release_package_to_repository(version)
@@ -126,6 +126,9 @@ <h1 class="title">Module <code>continuous_delivery_scripts.tag_and_release</code
126126
logger.info(&#34;Tagging commit&#34;)
127127
git.create_tag(get_language_specifics().get_version_tag(version), message=f&#34;release {version}&#34;)
128128
git.force_push_tag()
129+
git.fetch()
130+
git.pull()
131+
git.clean()
129132

130133

131134
def _generate_spdx_reports(project: SpdxProject) -&gt; None:
@@ -262,7 +265,7 @@ <h2 id="args">Args</h2>
262265
insert_licence_header(0)
263266
_update_repository(mode, is_new_version, version, current_branch)
264267
if is_new_version:
265-
if spdx_project:
268+
if spdx_project and get_language_specifics().should_include_spdx_in_package():
266269
_generate_spdx_reports(spdx_project)
267270
get_language_specifics().package_software(version)
268271
get_language_specifics().release_package_to_repository(version)</code></pre>

‎docs/third_party_IP_report.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</head>
6666
<body>
6767
<h1>Project's 3rd party IP report</h1>
68-
<p><i>2021-08-24 09:51:41.291575</i></p>
68+
<p><i>2021-08-24 12:43:39.920988</i></p>
6969
<h2>Summary</h2>
7070
<table>
7171
<thead>

‎docs/third_party_IP_report.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
3rd party IP report for continuous-delivery-scripts
22

3-
2021-08-24 09:51:41.291575
3+
2021-08-24 12:43:39.920988
44

55
# Summary:
66
Licence compliance: Compliant

0 commit comments

Comments
 (0)