Skip to content

Commit 600b6e5

Browse files
committed
🚀 releasing version 2.6.1 @ 2021-08-24 17:54
[skip ci]
1 parent 39f16a4 commit 600b6e5

File tree

7 files changed

+29
-9
lines changed

7 files changed

+29
-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.1" (2021-08-24)"2.6.1" (2021-08-24)
21+
====================
22+
23+
Bugfixes
24+
--------
25+
26+
- Fixed Golang packaging (#202108241747)
27+
28+
2029
"2.6.0" (2021-08-24)"2.6.0" (2021-08-24)
2130
====================
2231

continuous_delivery_scripts/_version.py

Lines changed: 3 additions & 3 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.0"
14-
COMMIT = "b0d8d4eb11bf92fac92b5040a047e2f1f7fbfa2f"
13+
__version__ = "2.6.1"
14+
COMMIT = "39f16a438afca45a08af0dd0a9bdfeac25d16692"
1515
MAJOR = 2
1616
MINOR = 6
17-
PATCH = 0
17+
PATCH = 1

docs/plugins/golang.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ <h1 class="title">Module <code>continuous_delivery_scripts.plugins.golang</code>
4848
logger = logging.getLogger(__name__)
4949

5050
SRC_DIR = configuration.get_value(ConfigurationVariable.SOURCE_DIR)
51+
ROOT_DIR = configuration.get_value(ConfigurationVariable.PROJECT_ROOT)
5152
ENVVAR_GORELEASER_GIT_TOKEN = &#34;GITHUB_TOKEN&#34;
5253
ENVVAR_GORELEASER_CUSTOMISED_TAG = &#34;GORELEASER_CURRENT_TAG&#34;
5354

@@ -97,7 +98,7 @@ <h1 class="title">Module <code>continuous_delivery_scripts.plugins.golang</code>
9798
env = os.environ
9899
env[ENVVAR_GORELEASER_CUSTOMISED_TAG] = version
99100
env[ENVVAR_GORELEASER_GIT_TOKEN] = configuration.get_value(ConfigurationVariable.GIT_TOKEN)
100-
check_call(_generate_goreleaser_check_command_list(), cwd=SRC_DIR)
101+
check_call(_generate_goreleaser_check_command_list(), cwd=ROOT_DIR)
101102

102103

103104
def _call_goreleaser_release(version: str) -&gt; None:
@@ -109,7 +110,7 @@ <h1 class="title">Module <code>continuous_delivery_scripts.plugins.golang</code>
109110
env = os.environ
110111
env[ENVVAR_GORELEASER_CUSTOMISED_TAG] = version
111112
env[ENVVAR_GORELEASER_GIT_TOKEN] = configuration.get_value(ConfigurationVariable.GIT_TOKEN)
112-
check_call(_generate_goreleaser_release_command_list(changelogPath), cwd=SRC_DIR, env=env)
113+
check_call(_generate_goreleaser_release_command_list(changelogPath), cwd=ROOT_DIR, env=env)
113114

114115

115116
class Go(BaseLanguage):

docs/tag_and_release.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h1 class="title">Module <code>continuous_delivery_scripts.tag_and_release</code
5050
from continuous_delivery_scripts.report_third_party_ip import generate_spdx_project_reports, SpdxProject
5151
from continuous_delivery_scripts.utils.configuration import configuration, ConfigurationVariable
5252
from continuous_delivery_scripts.utils.definitions import CommitType
53-
from continuous_delivery_scripts.utils.git_helpers import ProjectTempClone, GitWrapper
53+
from continuous_delivery_scripts.utils.git_helpers import ProjectTempClone, LocalProjectRepository, GitWrapper
5454
from continuous_delivery_scripts.utils.logging import log_exception, set_log_level
5555

5656
SPDX_REPORTS_DIRECTORY = &#34;licensing&#34;
@@ -83,6 +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+
_clean_repository()
8687
if spdx_project and get_language_specifics().should_include_spdx_in_package():
8788
_generate_spdx_reports(spdx_project)
8889
get_language_specifics().package_software(version)
@@ -131,6 +132,15 @@ <h1 class="title">Module <code>continuous_delivery_scripts.tag_and_release</code
131132
git.clean()
132133

133134

135+
def _clean_repository() -&gt; None:
136+
&#34;&#34;&#34;Cleans the local repository.&#34;&#34;&#34;
137+
with LocalProjectRepository() as git:
138+
logger.info(&#34;Cleaning repository&#34;)
139+
git.fetch()
140+
git.pull()
141+
git.clean()
142+
143+
134144
def _generate_spdx_reports(project: SpdxProject) -&gt; None:
135145
report_directory = Path(configuration.get_value(ConfigurationVariable.PROJECT_ROOT)).joinpath(
136146
SPDX_REPORTS_DIRECTORY
@@ -265,6 +275,7 @@ <h2 id="args">Args</h2>
265275
insert_licence_header(0)
266276
_update_repository(mode, is_new_version, version, current_branch)
267277
if is_new_version:
278+
_clean_repository()
268279
if spdx_project and get_language_specifics().should_include_spdx_in_package():
269280
_generate_spdx_reports(spdx_project)
270281
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 12:43:39.920988</i></p>
68+
<p><i>2021-08-24 17:54:17.342591</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 12:43:39.920988
3+
2021-08-24 17:54:17.342591
44

55
# Summary:
66
Licence compliance: Compliant

news/202108241747.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)