Skip to content

Commit 0758450

Browse files
committed
update pipeline
1 parent 2ee09db commit 0758450

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

.github/workflows/ESP32.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ jobs:
4343
!~/.espressif/dist/
4444
~/.cache/pip/
4545
~/micropython/
46-
~/esp32-camera/
47-
~/esp_new_jpeg/
4846
key: mpy-${{ env.MPY_RELEASE }}
4947
restore-keys: mpy-
5048

@@ -68,18 +66,6 @@ jobs:
6866
./install.sh all
6967
source ./export.sh
7068
71-
# Clone external components (if not cached)
72-
- name: Clone external components
73-
if: steps.cache_esp_idf.outputs.cache-hit != 'true'
74-
run: |
75-
cd ~
76-
# Clone camera driver
77-
git clone https://github.com/cnadler86/esp32-camera.git
78-
# Clone esp_new_jpeg
79-
git clone https://github.com/espressif/esp-adf-libs.git
80-
mv ~/esp-adf-libs/esp_new_jpeg ~/esp_new_jpeg
81-
rm -rf ~/esp-adf-libs
82-
8369
# Clone the latest MicroPython release (if not cached)
8470
- name: Clone MicroPython latest release
8571
id: clone-micropython
@@ -147,8 +133,6 @@ jobs:
147133
!~/.espressif/dist/
148134
~/.cache/pip/
149135
~/micropython/
150-
~/esp32-camera/
151-
~/esp_new_jpeg/
152136
key: mpy-${{ env.MPY_RELEASE }}
153137
restore-keys: mpy-
154138

@@ -176,9 +160,9 @@ jobs:
176160
IFS='-' read -r BOARD_NAME BOARD_VARIANT <<< "${BUILD_TARGET}"
177161
178162
if [ -n "${BOARD_VARIANT}" ]; then
179-
IDF_CMD="idf.py -D MICROPY_BOARD=$BOARD_NAME -D USER_C_MODULES=${{ github.workspace }}/micropython.cmake -D MICROPY_BOARD_VARIANT=$BOARD_VARIANT -B build-$BUILD_TARGET -D MP_CAMERA_DRIVER_VERSION=$CAM_DRIVER -D ESP32_CAMERA_DIR=$HOME/esp32-camera -D ESP_JPEG_DIR=$HOME/esp_new_jpeg"
163+
IDF_CMD="idf.py -D MICROPY_BOARD=$BOARD_NAME -D USER_C_MODULES=${{ github.workspace }}/micropython.cmake -D MICROPY_BOARD_VARIANT=$BOARD_VARIANT -B build-$BUILD_TARGET -D EXTRA_COMPONENT_DIRS=${{ github.workspace }};${{ github.workspace }}/../mp_jpeg"
180164
else
181-
IDF_CMD="idf.py -D MICROPY_BOARD=$BOARD_NAME -D USER_C_MODULES=${{ github.workspace }}/micropython.cmake -B build-$BUILD_TARGET -D MP_CAMERA_DRIVER_VERSION=$CAM_DRIVER -D ESP32_CAMERA_DIR=$HOME/esp32-camera -D ESP_JPEG_DIR=$HOME/esp_new_jpeg"
165+
IDF_CMD="idf.py -D MICROPY_BOARD=$BOARD_NAME -D USER_C_MODULES=${{ github.workspace }}/micropython.cmake -B build-$BUILD_TARGET -D EXTRA_COMPONENT_DIRS=${{ github.workspace }};${{ github.workspace }}/../mp_jpeg"
182166
fi
183167
if [ -n "${CAMERA_MODEL}" ]; then
184168
echo "FW_NAME=${CAMERA_MODEL}" >> $GITHUB_ENV

0 commit comments

Comments
 (0)