diff --git a/.github/workflows/release_maixcam.yml b/.github/workflows/release_maixcam.yml index 3c08ea1c..2143bc61 100644 --- a/.github/workflows/release_maixcam.yml +++ b/.github/workflows/release_maixcam.yml @@ -90,10 +90,22 @@ jobs: ./gen_os.sh $base_os_path $release_path $builtin_files_dir $os_version_name os_filename=${os_version_name}.img.xz os_filepath=`pwd`/tmp/$os_filename - sha256sum $os_filepath > ${maixpy_path}/sha256sum_files.txt sha256sum $release_path >> ${maixpy_path}/sha256sum_files.txt + sha256sum $os_filepath > ${maixpy_path}/sha256sum_files.txt echo "os_path=$os_filepath" >> $GITHUB_OUTPUT echo "os_name=$os_filename" >> $GITHUB_OUTPUT + echo "-------------------------------------" + echo "-- Generate system for MaixCAM-Pro --" + echo "-------------------------------------" + os_version_name_pro="maixcam-pro-${date_now}-maixpy-${maixpy_version}" + cp -f "${builtin_files_dir}/boot/maixcam_pro_logo.jpeg" "${builtin_files_dir}/boot/logo.jpeg" + sed -i 's/^panel=.*/panel=st7701_lct024bsi20/' "${builtin_files_dir}/boot/uEnv.txt" + ./gen_os.sh $base_os_path $release_path $builtin_files_dir $os_version_name_pro 1 + os_filename=${os_version_name_pro}.img.xz + os_filepath=`pwd`/tmp/$os_filename + sha256sum $os_filepath >> ${maixpy_path}/sha256sum_files.txt + echo "os_pro_path=$os_filepath" >> $GITHUB_OUTPUT + echo "os_pro_name=$os_filename" >> $GITHUB_OUTPUT - name: Build doc id: build_doc @@ -170,7 +182,7 @@ jobs: tag: ${{ github.ref }} repo_token: ${{ secrets.GITHUB_TOKEN }} - - name: Upload OS to release assets + - name: Upload MaixCAM OS to release assets uses: svenstaro/upload-release-action@v2 with: file: ${{ steps.build_maixpy.outputs.os_path }} @@ -178,6 +190,14 @@ jobs: tag: ${{ github.ref }} repo_token: ${{ secrets.GITHUB_TOKEN }} + - name: Upload MaixCAM-Pro OS to release assets + uses: svenstaro/upload-release-action@v2 + with: + file: ${{ steps.build_maixpy.outputs.os_pro_path }} + asset_name: ${{ steps.build_maixpy.outputs.os_pro_name }} + tag: ${{ github.ref }} + repo_token: ${{ secrets.GITHUB_TOKEN }} + - name: Publish MaixPy to pypi.org run: | echo "[pypi]" > ~/.pypirc diff --git a/maix/version.py b/maix/version.py index f20ab382..1b967c17 100644 --- a/maix/version.py +++ b/maix/version.py @@ -2,7 +2,7 @@ # Versions should comply with PEP440: https://peps.python.org/pep-0440/ version_major = 4 -version_minor = 5 -version_patch = 1 +version_minor = 6 +version_patch = 0 __version__ = "{}.{}.{}".format(version_major, version_minor, version_patch) diff --git a/tools/os/base_system_version.txt b/tools/os/base_system_version.txt index 7e47759d..bbc8f762 100644 --- a/tools/os/base_system_version.txt +++ b/tools/os/base_system_version.txt @@ -1 +1 @@ -20240905 \ No newline at end of file +20240926 \ No newline at end of file