Skip to content

Commit 3fb0fec

Browse files
monty-botmonty-bot
committed
🚀 releasing version 2.7.0 @ 2021-08-24 21:22
[skip ci]
1 parent 78bd7a6 commit 3fb0fec

13 files changed

+93
-15
lines changed

‎CHANGELOG.md

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

1818
[//]: # (begin_release_notes)
1919

20+
"2.7.0" (2021-08-24)"2.7.0" (2021-08-24)
21+
====================
22+
23+
Features
24+
--------
25+
26+
- Added a stash repository step (#202108242058)
27+
- Added a language specific option to clean repository before packaging (#202108242145)
28+
29+
2030
"2.6.2" (2021-08-24)"2.6.2" (2021-08-24)
2131
====================
2232

‎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.6.2"
14-
COMMIT = "dbe74121aaa7e464892a0d140993bd20712756ec"
13+
__version__ = "2.7.0"
14+
COMMIT = "78bd7a6bfe7f6b89060cdcf08c9519b9e863221b"
1515
MAJOR = 2
16-
MINOR = 6
17-
PATCH = 2
16+
MINOR = 7
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_clean_before_packaging" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_clean_before_packaging">should_clean_before_packaging</a></code></li>
245246
<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>
246247
</ul>
247248
</li>

‎docs/plugins/golang.html

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,11 @@ <h1 class="title">Module <code>continuous_delivery_scripts.plugins.golang</code>
156156
def get_current_spdx_project(self) -&gt; Optional[SpdxProject]:
157157
&#34;&#34;&#34;Gets current SPDX description.&#34;&#34;&#34;
158158
# TODO
159-
return None</code></pre>
159+
return None
160+
161+
def should_clean_before_packaging(self) -&gt; bool:
162+
&#34;&#34;&#34;States whether the repository must be cleaned before packaging happens.&#34;&#34;&#34;
163+
return True</code></pre>
160164
</details>
161165
</section>
162166
<section>
@@ -220,7 +224,11 @@ <h2 class="section-title" id="header-classes">Classes</h2>
220224
def get_current_spdx_project(self) -&gt; Optional[SpdxProject]:
221225
&#34;&#34;&#34;Gets current SPDX description.&#34;&#34;&#34;
222226
# TODO
223-
return None</code></pre>
227+
return None
228+
229+
def should_clean_before_packaging(self) -&gt; bool:
230+
&#34;&#34;&#34;States whether the repository must be cleaned before packaging happens.&#34;&#34;&#34;
231+
return True</code></pre>
224232
</details>
225233
<h3>Ancestors</h3>
226234
<ul class="hlist">
@@ -340,6 +348,7 @@ <h3>Inherited members</h3>
340348
<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>
341349
<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>
342350
<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>
351+
<li><code><a title="continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_clean_before_packaging" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_clean_before_packaging">should_clean_before_packaging</a></code></li>
343352
<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>
344353
</ul>
345354
</li>

‎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_clean_before_packaging" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_clean_before_packaging">should_clean_before_packaging</a></code></li>
267268
<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>
268269
</ul>
269270
</li>

‎docs/plugins/python.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ <h3>Inherited members</h3>
391391
<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>
392392
<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>
393393
<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_clean_before_packaging" href="../utils/language_specifics_base.html#continuous_delivery_scripts.utils.language_specifics_base.BaseLanguage.should_clean_before_packaging">should_clean_before_packaging</a></code></li>
394395
<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>
395396
</ul>
396397
</li>

‎docs/tag_and_release.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ <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-
_clean_repository()
86+
if get_language_specifics().should_clean_before_packaging():
87+
_clean_repository()
8788
if spdx_project and get_language_specifics().should_include_spdx_in_package():
8889
_generate_spdx_reports(spdx_project)
8990
get_language_specifics().package_software(version)
@@ -127,15 +128,13 @@ <h1 class="title">Module <code>continuous_delivery_scripts.tag_and_release</code
127128
logger.info(&#34;Tagging commit&#34;)
128129
git.create_tag(get_language_specifics().get_version_tag(version), message=f&#34;release {version}&#34;)
129130
git.force_push_tag()
130-
git.fetch()
131-
git.pull()
132-
git.clean()
133131

134132

135133
def _clean_repository() -&gt; None:
136134
&#34;&#34;&#34;Cleans the local repository.&#34;&#34;&#34;
137135
with LocalProjectRepository() as git:
138136
logger.info(&#34;Cleaning repository&#34;)
137+
git.stash()
139138
git.clean()
140139
git.fetch()
141140
git.pull()
@@ -276,7 +275,8 @@ <h2 id="args">Args</h2>
276275
insert_licence_header(0)
277276
_update_repository(mode, is_new_version, version, current_branch)
278277
if is_new_version:
279-
_clean_repository()
278+
if get_language_specifics().should_clean_before_packaging():
279+
_clean_repository()
280280
if spdx_project and get_language_specifics().should_include_spdx_in_package():
281281
_generate_spdx_reports(spdx_project)
282282
get_language_specifics().package_software(version)

‎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 19:28:16.436805</i></p>
68+
<p><i>2021-08-24 21:22:51.967342</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 19:28:16.436805
3+
2021-08-24 21:22:51.967342
44

55
# Summary:
66
Licence compliance: Compliant

‎docs/utils/git_helpers.html

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,13 @@ <h1 class="title">Module <code>continuous_delivery_scripts.utils.git_helpers</co
526526
if self.is_dirty():
527527
self.repo.git.clean(force=True, x=True, d=True)
528528

529+
def stash(self) -&gt; None:
530+
&#34;&#34;&#34;Stashes the repository.
531+
532+
Performs a stash.
533+
&#34;&#34;&#34;
534+
self.repo.git.stash(all=True, quiet=True)
535+
529536
def configure_for_github(self) -&gt; None:
530537
&#34;&#34;&#34;Reconfigures the repository.
531538

@@ -999,6 +1006,7 @@ <h3>Inherited members</h3>
9991006
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.root" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.root">root</a></code></li>
10001007
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_remote_url" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_remote_url">set_remote_url</a></code></li>
10011008
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_upstream_branch" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_upstream_branch">set_upstream_branch</a></code></li>
1009+
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.stash" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.stash">stash</a></code></li>
10021010
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.uncommitted_changes" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.uncommitted_changes">uncommitted_changes</a></code></li>
10031011
</ul>
10041012
</li>
@@ -1552,6 +1560,13 @@ <h2 id="args">Args</h2>
15521560
if self.is_dirty():
15531561
self.repo.git.clean(force=True, x=True, d=True)
15541562

1563+
def stash(self) -&gt; None:
1564+
&#34;&#34;&#34;Stashes the repository.
1565+
1566+
Performs a stash.
1567+
&#34;&#34;&#34;
1568+
self.repo.git.stash(all=True, quiet=True)
1569+
15551570
def configure_for_github(self) -&gt; None:
15561571
&#34;&#34;&#34;Reconfigures the repository.
15571572

@@ -2867,6 +2882,24 @@ <h2 id="args">Args</h2>
28672882
self.repo.git.branch(&#34;--set-upstream-to&#34;, self.get_remote_branch(branch_name))</code></pre>
28682883
</details>
28692884
</dd>
2885+
<dt id="continuous_delivery_scripts.utils.git_helpers.GitWrapper.stash"><code class="name flex">
2886+
<span>def <span class="ident">stash</span></span>(<span>self) ‑> NoneType</span>
2887+
</code></dt>
2888+
<dd>
2889+
<div class="desc"><p>Stashes the repository.</p>
2890+
<p>Performs a stash.</p></div>
2891+
<details class="source">
2892+
<summary>
2893+
<span>Expand source code</span>
2894+
</summary>
2895+
<pre><code class="python">def stash(self) -&gt; None:
2896+
&#34;&#34;&#34;Stashes the repository.
2897+
2898+
Performs a stash.
2899+
&#34;&#34;&#34;
2900+
self.repo.git.stash(all=True, quiet=True)</code></pre>
2901+
</details>
2902+
</dd>
28702903
</dl>
28712904
</dd>
28722905
<dt id="continuous_delivery_scripts.utils.git_helpers.LocalProjectRepository"><code class="flex name class">
@@ -2969,6 +3002,7 @@ <h3>Inherited members</h3>
29693002
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.root" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.root">root</a></code></li>
29703003
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_remote_url" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_remote_url">set_remote_url</a></code></li>
29713004
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_upstream_branch" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_upstream_branch">set_upstream_branch</a></code></li>
3005+
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.stash" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.stash">stash</a></code></li>
29723006
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.uncommitted_changes" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.uncommitted_changes">uncommitted_changes</a></code></li>
29733007
</ul>
29743008
</li>
@@ -3086,6 +3120,7 @@ <h4><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper" hr
30863120
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.root" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.root">root</a></code></li>
30873121
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_remote_url" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_remote_url">set_remote_url</a></code></li>
30883122
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_upstream_branch" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.set_upstream_branch">set_upstream_branch</a></code></li>
3123+
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.stash" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.stash">stash</a></code></li>
30893124
<li><code><a title="continuous_delivery_scripts.utils.git_helpers.GitWrapper.uncommitted_changes" href="#continuous_delivery_scripts.utils.git_helpers.GitWrapper.uncommitted_changes">uncommitted_changes</a></code></li>
30903125
</ul>
30913126
</li>

0 commit comments

Comments
 (0)