Skip to content

Commit a51f8ae

Browse files
committed
update version to 4.6.0
1 parent dedf550 commit a51f8ae

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

.github/workflows/release_maixcam.yml

+22-2
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,22 @@ jobs:
9090
./gen_os.sh $base_os_path $release_path $builtin_files_dir $os_version_name
9191
os_filename=${os_version_name}.img.xz
9292
os_filepath=`pwd`/tmp/$os_filename
93-
sha256sum $os_filepath > ${maixpy_path}/sha256sum_files.txt
9493
sha256sum $release_path >> ${maixpy_path}/sha256sum_files.txt
94+
sha256sum $os_filepath > ${maixpy_path}/sha256sum_files.txt
9595
echo "os_path=$os_filepath" >> $GITHUB_OUTPUT
9696
echo "os_name=$os_filename" >> $GITHUB_OUTPUT
97+
echo "-------------------------------------"
98+
echo "-- Generate system for MaixCAM-Pro --"
99+
echo "-------------------------------------"
100+
os_version_name_pro="maixcam-pro-${date_now}-maixpy-${maixpy_version}"
101+
cp -f "${builtin_files_dir}/boot/maixcam_pro_logo.jpeg" "${builtin_files_dir}/boot/logo.jpeg"
102+
sed -i 's/^panel=.*/panel=st7701_lct024bsi20/' "${builtin_files_dir}/boot/uEnv.txt"
103+
./gen_os.sh $base_os_path $release_path $builtin_files_dir $os_version_name_pro 1
104+
os_filename=${os_version_name_pro}.img.xz
105+
os_filepath=`pwd`/tmp/$os_filename
106+
sha256sum $os_filepath >> ${maixpy_path}/sha256sum_files.txt
107+
echo "os_pro_path=$os_filepath" >> $GITHUB_OUTPUT
108+
echo "os_pro_name=$os_filename" >> $GITHUB_OUTPUT
97109
98110
- name: Build doc
99111
id: build_doc
@@ -170,14 +182,22 @@ jobs:
170182
tag: ${{ github.ref }}
171183
repo_token: ${{ secrets.GITHUB_TOKEN }}
172184

173-
- name: Upload OS to release assets
185+
- name: Upload MaixCAM OS to release assets
174186
uses: svenstaro/upload-release-action@v2
175187
with:
176188
file: ${{ steps.build_maixpy.outputs.os_path }}
177189
asset_name: ${{ steps.build_maixpy.outputs.os_name }}
178190
tag: ${{ github.ref }}
179191
repo_token: ${{ secrets.GITHUB_TOKEN }}
180192

193+
- name: Upload MaixCAM-Pro OS to release assets
194+
uses: svenstaro/upload-release-action@v2
195+
with:
196+
file: ${{ steps.build_maixpy.outputs.os_pro_path }}
197+
asset_name: ${{ steps.build_maixpy.outputs.os_pro_name }}
198+
tag: ${{ github.ref }}
199+
repo_token: ${{ secrets.GITHUB_TOKEN }}
200+
181201
- name: Publish MaixPy to pypi.org
182202
run: |
183203
echo "[pypi]" > ~/.pypirc

maix/version.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Versions should comply with PEP440: https://peps.python.org/pep-0440/
33

44
version_major = 4
5-
version_minor = 5
6-
version_patch = 1
5+
version_minor = 6
6+
version_patch = 0
77

88
__version__ = "{}.{}.{}".format(version_major, version_minor, version_patch)

tools/os/base_system_version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20240905
1+
20240926

0 commit comments

Comments
 (0)