Skip to content

Commit 2c3c748

Browse files
217heidai217heidai
committed
update
1 parent 7208ec5 commit 2c3c748

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎.github/workflows/LVGL-MicroPython.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,13 @@ jobs:
4343
cd $LVGL
4444
if [${{ fromJSON(matrix.info).INDEV }} == ""]; then
4545
python3 make.py esp32 BOARD=${{ fromJSON(matrix.info).BOARD }} BOARD_VARIANT=${{ fromJSON(matrix.info).BOARD_VARIANT }} --flash-size=${{ fromJSON(matrix.info).FLASH }} DISPLAY=${{ fromJSON(matrix.info).DISPLAY }}
46+
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
47+
echo "OUTPUT="
4648
else
4749
python3 make.py esp32 BOARD=${{ fromJSON(matrix.info).BOARD }} BOARD_VARIANT=${{ fromJSON(matrix.info).BOARD_VARIANT }} --flash-size=${{ fromJSON(matrix.info).FLASH }} DISPLAY=${{ fromJSON(matrix.info).DISPLAY }} INDEV=${{ fromJSON(matrix.info).INDEV }}
50+
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
4851
fi
4952
echo "status=success" >> $GITHUB_OUTPUT
50-
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
5153
5254
- name: Organize compiled firmware
5355
if: steps.compile.outputs.status == 'success' && !cancelled()

‎.github/workflows/MicroPython.yml

+23-25
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ env:
1010
ESPIDF: esp-idf
1111
ESPIDF_REPO: https://github.com/espressif/esp-idf.git
1212
ESPIDF_VERSION: v5.2.2
13-
TZ: Asia/Shanghai
1413

1514
jobs:
1615
MicroPython_ESP32:
@@ -37,61 +36,60 @@ jobs:
3736
sudo apt-get update -y
3837
sudo apt-get install -y build-essential libffi-dev git pkg-config
3938
sudo apt-get install -y git wget flex bison gperf python3 python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0 python-is-python3 pip
40-
sudo timedatectl set-timezone "$TZ"
4139
4240
- name: Clone ESP-IDF
4341
run: |
44-
git clone -b $ESPIDF_VERSION --recursive $ESPIDF_REPO $ESPIDF
45-
cd $ESPIDF
46-
git checkout $ESPIDF_VERSION
42+
git clone -b ${{env.ESPIDF_VERSION}} --recursive ${{env.ESPIDF_REPO}} ${{env.ESPIDF}}
43+
cd ${{env.ESPIDF}}
44+
git checkout ${{env.ESPIDF_VERSION}}
4745
git submodule update --init --recursive
4846
./install.sh
4947
source export.sh
5048
5149
- name: Clone MicroPython
5250
run: |
53-
git clone -b $MICROPYTHON_VERSION --recursive $MICROPYTHON_REPO $MICROPYTHON
54-
cd $MICROPYTHON
55-
git checkout $MICROPYTHON_VERSION
51+
git clone -b ${{env.MICROPYTHON_VERSION}} --recursive ${{env.MICROPYTHON_REPO}} ${{env.MICROPYTHON}}
52+
cd ${{env.MICROPYTHON}}
53+
git checkout ${{env.MICROPYTHON_VERSION}}
5654
git submodule update --init --recursive
5755
5856
- name: Custom MicroPython for ESP32
5957
run: |
60-
wget -P $MICROPYTHON/ports/esp32/modules https://raw.githubusercontent.com/Josverl/micropython-stubs/main/mip/typing.py
61-
wget -P $MICROPYTHON/ports/esp32/modules https://raw.githubusercontent.com/micropython/micropython-lib/master/python-stdlib/logging/logging.py
62-
wget -P $MICROPYTHON/ports/esp32/modules https://raw.githubusercontent.com/micropython/micropython-lib/master/micropython/drivers/storage/sdcard/sdcard.py
63-
rm -rf $MICROPYTHON/ports/esp32/boards/${{ fromJSON(matrix.info).BOARD }}/mpconfigboard.cmake
64-
rm -rf $MICROPYTHON/ports/esp32/boards/${{ fromJSON(matrix.info).BOARD }}/sdkconfig.board
65-
mv config/micropython/${{ fromJSON(matrix.info).BOARD }}.mpconfigboard $MICROPYTHON/ports/esp32/boards/${{ fromJSON(matrix.info).BOARD }}/mpconfigboard.cmake
66-
mv config/micropython/N${{ fromJSON(matrix.info).FLASH }}.sdkconfig $MICROPYTHON/ports/esp32/boards/${{ fromJSON(matrix.info).BOARD }}/sdkconfig.board
58+
wget -P ${{env.MICROPYTHON}}/ports/esp32/modules https://raw.githubusercontent.com/Josverl/micropython-stubs/main/mip/typing.py
59+
wget -P ${{env.MICROPYTHON}}/ports/esp32/modules https://raw.githubusercontent.com/micropython/micropython-lib/master/python-stdlib/logging/logging.py
60+
wget -P ${{env.MICROPYTHON}}/ports/esp32/modules https://raw.githubusercontent.com/micropython/micropython-lib/master/micropython/drivers/storage/sdcard/sdcard.py
61+
rm -rf ${{env.MICROPYTHON}}/ports/esp32/boards/${{fromJSON(matrix.info).BOARD}}/mpconfigboard.cmake
62+
rm -rf ${{env.MICROPYTHON}}/ports/esp32/boards/${{fromJSON(matrix.info).BOARD}}/sdkconfig.board
63+
mv config/micropython/${{fromJSON(matrix.info).BOARD}}.mpconfigboard ${{env.MICROPYTHON}}/ports/esp32/boards/${{fromJSON(matrix.info).BOARD}}/mpconfigboard.cmake
64+
mv config/micropython/N${{fromJSON(matrix.info).FLASH}}.sdkconfig ${{env.MICROPYTHON}}/ports/esp32/boards/${{fromJSON(matrix.info).BOARD}}/sdkconfig.board
6765
6866
- name: Compile the firmware
6967
id: compile
7068
run: |
71-
source $ESPIDF/export.sh
72-
cd $MICROPYTHON
69+
source ${{env.ESPIDF}}/export.sh
70+
cd ${{env.MICROPYTHON}}
7371
make -C mpy-cross
7472
cd ports/esp32
7573
make submodules
76-
make V=1 BOARD=${{ fromJSON(matrix.info).BOARD }} BOARD_VARIANT=${{ fromJSON(matrix.info).BOARD_VARIANT }}
74+
make V=1 BOARD=${{fromJSON(matrix.info).BOARD}} BOARD_VARIANT=${{fromJSON(matrix.info).BOARD_VARIANT}}
7775
echo "status=success" >> $GITHUB_OUTPUT
78-
echo "OUTPUT=$MICROPYTHON/ports/esp32/build-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}" >> $GITHUB_ENV
79-
echo "FIREMWARE=MicroPython-${{ fromJSON(matrix.info).BOARD }}_${{ fromJSON(matrix.info).BOARD_VARIANT }}_N${{ fromJSON(matrix.info).FLASH }}-${{ env.MICROPYTHON_VERSION }}.bin" >> $GITHUB_ENV
76+
echo "OUTPUT=${{env.MICROPYTHON}}/ports/esp32/build-${{fromJSON(matrix.info).BOARD}}-${{fromJSON(matrix.info).BOARD_VARIANT}}" >> $GITHUB_ENV
77+
echo "FIREMWARE=MicroPython-${{fromJSON(matrix.info).BOARD}}_${{fromJSON(matrix.info).BOARD_VARIANT}}_N${{fromJSON(matrix.info).FLASH}}-${{env.MICROPYTHON_VERSION}}.bin" >> $GITHUB_ENV
8078
8179
- name: Organize compiled firmware
8280
id: firmware
8381
if: steps.compile.outputs.status == 'success' && !cancelled()
8482
run: |
85-
mv ${{ env.OUTPUT }}/firmware.bin ${{ env.OUTPUT }}/${{ env.FIREMWARE }}
83+
mv ${{env.OUTPUT}}/firmware.bin ${{env.OUTPUT}}/${{env.FIREMWARE}}
8684
8785
- name: Upload firmware to release
8886
if: steps.compile.outputs.status == 'success' && !cancelled()
8987
uses: svenstaro/upload-release-action@v2
9088
with:
91-
repo_token: ${{ secrets.GITHUB_TOKEN }}
92-
file: ${{ env.OUTPUT }}/${{ env.FIREMWARE }}
93-
asset_name: ${{ env.FIREMWARE }}
94-
tag: MicroPython-${{ env.MICROPYTHON_VERSION }}
89+
repo_token: ${{secrets.GITHUB_TOKEN}}
90+
file: ${{env.OUTPUT}}/${{env.FIREMWARE}}
91+
asset_name: ${{env.FIREMWARE}}
92+
tag: MicroPython-${{env.MICROPYTHON_VERSION}}
9593
body: |
9694
### MicroPython Firmware For ESP32
9795
1. ESP32_GENERIC_SPIRAM_Nx: ESP32、ESP32-WROOM、ESP32-WROVER、ESP32-SOLO、ESP32-PICO、ESP32-MINI with SPIRAM and xMib Flash

0 commit comments

Comments
 (0)