File tree Expand file tree Collapse file tree 5 files changed +17
-33
lines changed Expand file tree Collapse file tree 5 files changed +17
-33
lines changed Original file line number Diff line number Diff line change @@ -37,26 +37,13 @@ runs:
37
37
fetch-depth : ${{ inputs.fetch-depth }}
38
38
token : ${{ inputs.token }}
39
39
submodules : ${{ inputs.submodules }}
40
-
41
- - name : Cache esp-idf and its tools
42
- id : esp-idf-cache
43
- uses : actions/cache@v3
44
- with :
45
- path : |
46
- ~/esp/esp-idf
47
- ~/.espressif
48
- key : ${{ runner.os }}-esp-${{ inputs.esp_idf_version }}
49
-
50
- - run : |
51
- if echo ${{ steps.esp-idf-cache.outputs.cache-hit }} | grep -c "true"
52
- then
53
- echo "Cache hit - skipping dependency installation"
54
- else
55
- sh ${{ github.action_path }}/install.sh ${{ inputs.esp_idf_version }}
56
- fi
57
- shell: bash
58
40
59
41
- run : |
42
+ cd
43
+
44
+ git clone --recursive https://github.com/espressif/esp-idf.git
45
+
46
+ sh ${{ github.action_path }}/install.sh ${{ inputs.esp_idf_version }}
60
47
source ~/esp/esp-idf/export.sh
61
48
idf.py set-target ${{ inputs.esp_idf_target }}
62
49
shell: bash
Original file line number Diff line number Diff line change 19
19
with :
20
20
python-version : ' 3.10'
21
21
22
- - uses : ./.github/actions/esp-idf-action
23
- with :
24
- esp_idf_version : v5.0.4
25
- esp_idf_target : esp32s3
26
-
27
22
- name : Install Dependencies
28
23
run : brew install --force gcc libffi cmake ninja make
29
24
Original file line number Diff line number Diff line change 20
20
with :
21
21
python-version : ' 3.10'
22
22
23
- - uses : ./.github/actions/esp-idf-action
24
- with :
25
- esp_idf_version : v5.0.4
26
- esp_idf_target : esp32s3
27
-
28
23
- name : Install Deps
29
24
run : sudo apt-get install --force-yes -y build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev
30
25
Original file line number Diff line number Diff line change 20
20
with :
21
21
python-version : ' 3.10'
22
22
23
- - uses : ./.github/actions/esp-idf-action
24
- with :
25
- esp_idf_version : v5.0.4
26
- esp_idf_target : esp32s3
27
-
28
23
- name : Install Dependencies
29
24
run : |
30
25
winget install --accept-source-agreements --accept-package-agreements ezwinports.make
Original file line number Diff line number Diff line change @@ -298,6 +298,15 @@ def setup_idf_environ():
298
298
env = {k : v for k , v in os .environ .items () if not k .startswith ('IDF' )}
299
299
env ['IDF_PATH' ] = os .path .abspath (idf_path )
300
300
301
+ py_path = os .path .split (sys .executable )[0 ]
302
+
303
+ if 'PATH' in os .environ :
304
+ os .environ ['PATH' ] = py_path + os .pathsep + os .environ ['PATH' ]
305
+ elif 'path' in os .environ :
306
+ os .environ ['path' ] = py_path + os .pathsep + os .environ ['path' ]
307
+ else :
308
+ os .environ ['PATH' ] = py_path + os .pathsep
309
+
301
310
result , output = spawn (cmds , env = env , out_to_screen = False )
302
311
303
312
if result != 0 :
@@ -310,6 +319,9 @@ def setup_idf_environ():
310
319
line .split ('=' , 1 )[0 ]: line .split ('=' , 1 )[1 ]
311
320
for line in output
312
321
}
322
+
323
+ print (temp_env )
324
+
313
325
if 'PATH' in temp_env :
314
326
env ['PATH' ] = temp_env ['PATH' ]
315
327
elif 'path' in temp_env :
You can’t perform that action at this time.
0 commit comments