Skip to content

Commit 2ee09db

Browse files
committed
update pipeline
1 parent 448a9f1 commit 2ee09db

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

.github/workflows/ESP32.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,10 @@ jobs:
7575
cd ~
7676
# Clone camera driver
7777
git clone https://github.com/cnadler86/esp32-camera.git
78-
echo "ESP32_CAMERA_DIR=~/esp32-camera" >> $GITHUB_ENV
7978
# Clone esp_new_jpeg
8079
git clone https://github.com/espressif/esp-adf-libs.git
8180
mv ~/esp-adf-libs/esp_new_jpeg ~/esp_new_jpeg
8281
rm -rf ~/esp-adf-libs
83-
echo "ESP_JPEG_DIR=~/esp_new_jpeg" >> $GITHUB_ENV
8482
8583
# Clone the latest MicroPython release (if not cached)
8684
- name: Clone MicroPython latest release
@@ -168,11 +166,6 @@ jobs:
168166
cd ${{ github.workspace }}
169167
cd ..
170168
git clone https://github.com/cnadler86/mp_jpeg.git
171-
# Set environment variables for component directories
172-
echo "ESP32_CAMERA_DIR=~/esp32-camera" >> $GITHUB_ENV
173-
echo "ESP_JPEG_DIR=~/esp_new_jpeg" >> $GITHUB_ENV
174-
export ESP32_CAMERA_DIR=~/esp32-camera
175-
export ESP_JPEG_DIR=~/esp_new_jpeg
176169
cd ~/esp32-camera
177170
CAM_DRIVER=$(git describe --tags --always --dirty)
178171
cd ~/micropython/ports/esp32
@@ -183,9 +176,9 @@ jobs:
183176
IFS='-' read -r BOARD_NAME BOARD_VARIANT <<< "${BUILD_TARGET}"
184177
185178
if [ -n "${BOARD_VARIANT}" ]; then
186-
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"
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"
187180
else
188-
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"
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"
189182
fi
190183
if [ -n "${CAMERA_MODEL}" ]; then
191184
echo "FW_NAME=${CAMERA_MODEL}" >> $GITHUB_ENV

0 commit comments

Comments
 (0)