Merge branch 'bump/new_version' into 'main'

Bump/new version

See merge request qa/idf-components/iperf-cmd!20

Author: ydhub

.cz.toml

@@ -1,5 +1,5 @@
 [tool.commitizen]
-version = "0.1.2"
+version = "0.1.3"
 name = "cz_conventional_commits"
 version_files = [
     "apps/iperf/main/idf_component.yml",

CONTRIBUTING.md

@@ -40,7 +40,7 @@ Your PR may not be published until a new version of this component is released.
 When releasing a new component version we have to:
 
 - Pass build/test with current (latest) version commit.
-- Bump a new version using `cz bump`:
+- Bump a new version using `cz bump`/`./tools/cz_bump.sh`:
 
   ```bash
   git branch -D bump/new_version || true

apps/iperf/main/idf_component.yml

@@ -1,8 +1,8 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/iperf:
-    version: =0.1.2
+    version: =0.1.3
     override_path: ../../../iperf
   espressif/iperf-cmd:
-    version: =0.1.2
+    version: =0.1.3
     override_path: ../../../iperf-cmd

iperf-cmd/CHANGELOG.md

@@ -1,12 +1,23 @@
 # Changelog
 
-## [v0.1.2](https://github.com/espressif/iperf-cmd/commit//v0.1.2)
+## [v0.1.3](https://github.com/espressif/iperf-cmd/releases/tag/v0.1.3)
+
+### Features
+
+- add kconfig for iperf tcp/udp tx/rx length ([c6b69b08](https://github.com/espressif/iperf-cmd/releases/tagc6b69b08))
+
+### Updates
+
+- change api names, do not use app_xxx ([449fab6a](https://github.com/espressif/iperf-cmd/releases/tag449fab6a))
+- update dependencies [espressif/iperf](https://components.espressif.com/components/espressif/iperf) to v0.1.3
+
+## [v0.1.2](https://github.com/espressif/iperf-cmd/releases/tag/v0.1.2)
 
 ### Bug Fixes
 
 - fix build with ipv6 only ([caea9730](https://github.com/espressif/iperf-cmd/commit/caea9730))
 
-## [0.1.1](https://github.com/espressif/iperf-cmd/commits/v0.1.1)
+## [0.1.1](https://github.com/espressif/iperf-cmd/releases/tag/v0.1.1)
 
 ### Features
 

iperf-cmd/README.md

@@ -33,6 +33,6 @@ This repository contains `iperf` command based esp-idf console.
   ```yaml
   dependencies:
     espressif/iperf_cmd:
-      version: "^0.1.2"
+      version: "^0.1.3"
   ```
 - For more details refer [IDF Component Manager](https://docs.espressif.com/projects/idf-component-manager/en/latest/)

iperf-cmd/idf_component.yml

@@ -1,4 +1,4 @@
-version: 0.1.2
+version: 0.1.3
 description: Iperf command based on esp-idf console
 url: https://github.com/espressif/iperf-cmd/tree/master/iperf-cmd
 repository: https://github.com/espressif/iperf-cmd.git
@@ -8,7 +8,7 @@ license: Apache-2.0
 dependencies:
   idf: '>=4.3'
   espressif/iperf:
-    version: =0.1.2
+    version: =0.1.3
 examples:
   - path: ../apps/iperf/
 files:

iperf/CHANGELOG.md

@@ -1,13 +1,27 @@
 # Changelog
 
-## [v0.1.2](https://github.com/espressif/iperf-cmd/commit//v0.1.2)
+## [v0.1.3](https://github.com/espressif/iperf-cmd/releases/tag/v0.1.3)
+
+### Features
+
+- add kconfig for iperf tcp/udp tx/rx length ([c6b69b08](https://github.com/espressif/iperf-cmd/releases/tagc6b69b08))
+
+### Bug Fixes
+
+- fix iperf tcp rx thrpt is 0 when test with Redmi RB06 ([cd59afd3](https://github.com/espressif/iperf-cmd/releases/tagcd59afd3))
+
+### Updates
+
+- change api names, do not use app_xxx ([449fab6a](https://github.com/espressif/iperf-cmd/releases/tag449fab6a))
+
+## [v0.1.2](https://github.com/espressif/iperf-cmd/releases/tag/v0.1.2)
 
 ### Bug Fixes
 
 - fix build with ipv6 only ([caea9730](https://github.com/espressif/iperf-cmd/commit/caea9730))
 - No debug if non-fattal errorno ENOBUFS received ([55cce9dc](https://github.com/espressif/iperf-cmd/commit/55cce9dc))
 
-## [0.1.1](https://github.com/espressif/iperf-cmd/commits/v0.1.1)
+## [0.1.1](https://github.com/espressif/iperf-cmd/releases/tag/v0.1.1)
 
 ### Features
 

iperf/README.md

@@ -16,6 +16,6 @@ This repository contains a basic iperf core engine.
   ```yaml
   dependencies:
     espressif/iperf:
-      version: "^0.1.2"
+      version: "^0.1.3"
   ```
 - For more details refer [IDF Component Manager](https://docs.espressif.com/projects/idf-component-manager/en/latest/)

iperf/idf_component.yml

@@ -1,4 +1,4 @@
-version: 0.1.2
+version: 0.1.3
 description: Iperf Core Engine
 url: https://github.com/espressif/iperf-cmd/tree/master/iperf
 repository: https://github.com/espressif/iperf-cmd.git

tools/changelog.py

@@ -10,7 +10,8 @@
 import subprocess
 
 
-COMMIT_BASE_URL = 'https://github.com/espressif/iperf-cmd/commit/'
+RELEASE_TAG_BASE_URL = 'https://github.com/espressif/iperf-cmd/releases/tag'
+IPERF_COMPONENT_URL = 'https://components.espressif.com/components/espressif/iperf'
 PROJECT_ROOT = pathlib.Path(__file__).resolve().parents[1]
 CZ_OLD_TAG = os.environ['CZ_PRE_CURRENT_TAG_VERSION']
 CZ_NEW_TAG = os.environ['CZ_PRE_NEW_TAG_VERSION']
@@ -36,7 +37,7 @@ def check_repo():
     '''Check current ref tag in repository
     '''
     subprocess.check_call(
-        ['git', 'fetch', '--prune', '--prune-tags'],
+        ['git', 'fetch', '--prune', '--prune-tags', '--force'],
         cwd=PROJECT_ROOT,
         )
 
@@ -54,7 +55,8 @@ def update_changelog():
     # Update ChangeLog
     for component in ['iperf', 'iperf-cmd']:
         git_logs = subprocess.check_output(
-            ['git', 'log', f'{CZ_OLD_TAG}..HEAD', f'{component}'],
+            # ignore merge commits
+            ['git', 'log', '--no-merges', f'{CZ_OLD_TAG}..HEAD', f'{component}'],
             cwd=PROJECT_ROOT,
         ).decode()
 
@@ -64,11 +66,15 @@ def update_changelog():
             commit = COMMIT_PATTERN.match(commit_log).group(0)
             for match in CHANGELOG_PATTERN.finditer(commit_log):
                 if match.group(2):
-                    _changelog = f'- {match.group(2)}: {match.group(3)} ([{commit}]({COMMIT_BASE_URL}{commit}))'
+                    _changelog = f'- {match.group(2)}: {match.group(3)} ([{commit}]({RELEASE_TAG_BASE_URL}{commit}))'
                 else:
-                    _changelog = f'- {match.group(3)} ([{commit}]({COMMIT_BASE_URL}{commit}))'
+                    _changelog = f'- {match.group(3)} ([{commit}]({RELEASE_TAG_BASE_URL}{commit}))'
                 changelogs[CHANGELOG_SECTIONS[match.group(1)]].append(_changelog)
 
+        if component == 'iperf-cmd':
+            _changelog = f'- update dependencies [espressif/iperf]({IPERF_COMPONENT_URL}) to {CZ_NEW_TAG}'
+            changelogs['Updates'].append(_changelog)
+
         # Update changelog file
         with open(str(PROJECT_ROOT / component / 'CHANGELOG.md'), encoding='utf-8') as fr:
             changelog_data = fr.readlines()
@@ -79,7 +85,7 @@ def update_changelog():
             changelog_data.insert(2, f'### {key}\n\n' + '\n'.join(values) + '\n\n')
             changed = True
         if changed:
-            changelog_data.insert(2, f'## [{CZ_NEW_TAG}]({COMMIT_BASE_URL}/{CZ_NEW_TAG})\n\n')
+            changelog_data.insert(2, f'## [{CZ_NEW_TAG}]({RELEASE_TAG_BASE_URL}/{CZ_NEW_TAG})\n\n')
         with open(str(PROJECT_ROOT / component / 'CHANGELOG.md'), 'w', encoding='utf-8') as fw:
             fw.write(''.join(changelog_data))