Skip to content

Commit 6a291ea

Browse files
committed
update pipeline
1 parent c90e062 commit 6a291ea

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

.github/workflows/ESP32.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ concurrency:
2424
jobs:
2525
setup-environment:
2626
runs-on: ubuntu-24.04
27-
outputs:
28-
idf_ver: ${{ steps.get_idf_ver.outputs.idf_ver }}
2927
steps:
3028
# Get the latest MicroPython release
3129
- name: Get MicroPython latest release
@@ -73,22 +71,19 @@ jobs:
7371
make
7472
7573
echo "Micropython setup successfully"
76-
77-
# Get IDF version from MicroPython ci.sh
78-
- name: Get IDF version
79-
id: get_idf_ver
80-
run: |
81-
source ~/micropython/tools/ci.sh
82-
echo "idf_ver=$IDF_VER" >> $GITHUB_OUTPUT
83-
echo "IDF_VER=$IDF_VER"
74+
# Extract IDF_VER directly from ci.sh
75+
IDF_VER=$(grep "^IDF_VER=" ~/micropython/tools/ci.sh | cut -d'=' -f2)
76+
echo "IDF_VER=$IDF_VER" >> $GITHUB_ENV
77+
echo "Using ESP-IDF version: $IDF_VER"
8478
8579
# Download and set up ESP-IDF (if not cached)
8680
- name: Set up ESP-IDF
8781
id: export-idf
8882
if: steps.cache_esp_idf.outputs.cache-hit != 'true'
8983
run: |
9084
cd ~
91-
git clone --depth 1 --branch ${{ steps.get_idf_ver.outputs.idf_ver }} https://github.com/espressif/esp-idf.git
85+
# git clone --depth 1 --branch v5.5.1 https://github.com/espressif/esp-idf.git
86+
git clone --depth 1 --branch ${{ env.IDF_VER }} https://github.com/espressif/esp-idf.git
9287
git -C esp-idf submodule update --init --recursive --filter=tree:0
9388
cd esp-idf
9489
./install.sh all
@@ -132,7 +127,6 @@ jobs:
132127
run: |
133128
MPY_RELEASE=$(curl --silent "https://api.github.com/repos/micropython/micropython/releases/latest" | jq -r .tag_name)
134129
echo "MPY_RELEASE=${MPY_RELEASE}" >> $GITHUB_ENV
135-
echo "IDF_VER=${{ needs.setup-environment.outputs.idf_ver }}" >> $GITHUB_ENV
136130
137131
# Cache ESP-IDF dependencies and MicroPython
138132
- name: Cache ESP-IDF and MicroPython

0 commit comments

Comments
 (0)