Skip to content

Commit 09e7187

Browse files
authored
Release v1.5.1 (#1008)
* Prepare for v1.5.1 * Update version.h to v1.5.1
1 parent ab6f8ed commit 09e7187

File tree

7 files changed

+23
-3
lines changed

7 files changed

+23
-3
lines changed

.github/workflows/autobuild.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,9 @@ jobs:
7272

7373
- name: Build release
7474
run: cd "$GITHUB_WORKSPACE" && /usr/bin/bash ./build.sh -z -l "$GITHUB_WORKSPACE"/.github/workflows/platformio.release-${{ matrix.target-platform }}.ini -i "$GITHUB_WORKSPACE"/platformio-generated.ini
75+
76+
- name: Upload firmware zip for ${{ matrix.target-platform }}
77+
uses: actions/upload-artifact@v4
78+
with:
79+
name: ${{ matrix.target-platform }}
80+
path: firmware/**
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

debug_version.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,22 @@ def load_version_macros(path):
5959

6060
def update_version_macros(path, macros):
6161
txt = [line.rstrip() for line in open(path)]
62+
saw_minor = saw_patch = False
6263
for line in txt:
6364
m = re.match(MACRO_PATTERN, line)
6465
if m:
6566
name = m.group(1)
6667
if name not in macros:
6768
continue
6869
line = f"#define {name} {macros[name]}"
70+
if name == "FN_VERSION_MINOR":
71+
saw_minor = True
72+
if name == "FN_VERSION_PATCH":
73+
saw_patch = True
74+
elif not line.strip() and saw_minor and not saw_patch:
75+
name = "FN_VERSION_PATCH"
76+
line = f"#define {name} {macros[name]}\n" + line
77+
saw_patch = True
6978
print(line)
7079
return
7180

@@ -96,6 +105,7 @@ def main():
96105
cur_macros = load_version_macros(version_h_path)
97106
ver_major = int(cur_macros['FN_VERSION_MAJOR'])
98107
ver_minor = int(cur_macros['FN_VERSION_MINOR'])
108+
ver_patch = int(cur_macros.get('FN_VERSION_PATCH', 0))
99109

100110
if args.set_version:
101111
version = args.set_version
@@ -108,19 +118,22 @@ def main():
108118
ver_patch = 0
109119
cur_macros['FN_VERSION_MAJOR'] = ver_major
110120
cur_macros['FN_VERSION_MINOR'] = ver_minor
121+
cur_macros['FN_VERSION_PATCH'] = ver_patch
111122
if m.group(4):
112123
ver_patch = int(m.group(4))
113124
cur_macros['FN_VERSION_PATCH'] = ver_patch
114125
if m.group(6):
115126
ver_rc = int(m.group(6))
116127
cur_macros['FN_VERSION_RC'] = ver_rc
117128
cur_macros['FN_VERSION_DATE'] = modified
129+
version = f"v{ver_major}.{ver_minor}.{ver_patch}"
118130

119131
else:
120132
m = re.match(r"^v([0-9]+)[.]([0-9]+)[.]([0-9]+)-([0-9]+)-g(.*)", version)
121133
if m:
122134
ver_major = macros['FN_VERSION_MAJOR'] = int(m.group(1))
123135
ver_minor = macros['FN_VERSION_MINOR'] = int(m.group(2))
136+
ver_minor = macros['FN_VERSION_PATCH'] = int(m.group(3))
124137
version = f"v{m.group(1)}.{m.group(2)}-{m.group(5)}"
125138
else:
126139
m = re.match(r"^([a-z0-9]{8})$", version)

include/version.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212

1313
#define FN_VERSION_MAJOR 1
1414
#define FN_VERSION_MINOR 5
15+
#define FN_VERSION_PATCH 1
1516

16-
#define FN_VERSION_BUILD "036ff4922f64fe9f1a3e1e6920e487d3f159afbd"
17+
#define FN_VERSION_BUILD "a791667fe8645b03fc660f337bdb8cf8fe6b9cef"
1718

18-
#define FN_VERSION_DATE "2025-04-02 10:07:01"
19+
#define FN_VERSION_DATE "2025-09-08 07:43:48"
1920

20-
#define FN_VERSION_FULL "v1.5.0"
21+
#define FN_VERSION_FULL "v1.5.1"
2122

2223
#endif /* _VERSION_H */

0 commit comments

Comments
 (0)