Skip to content

Commit b70cc3f

Browse files
committed
fix(lws): Remove lws support for IDF>=v6.0
1 parent cccfdd9 commit b70cc3f

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

.github/workflows/lws_build.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Libwebsockets build
1414
strategy:
1515
matrix:
16-
idf_ver: ["latest", "release-v5.3", "release-v5.4"]
16+
idf_ver: ["release-v5.3", "release-v5.4", "release-v5.5"]
1717
test: [ { app: example, path: "examples/client" }]
1818
runs-on: ubuntu-22.04
1919
container: espressif/idf:${{ matrix.idf_ver }}
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
idf_ver: ["latest", "release-v5.3", "release-v5.4"]
54+
idf_ver: ["release-v5.3", "release-v5.4", "release-v5.5"]
5555
idf_target: ["esp32"]
5656
test: [ { app: example, path: "examples/client" }]
5757
runs-on:
@@ -65,14 +65,24 @@ jobs:
6565
with:
6666
name: lws_target_esp32_${{ matrix.idf_ver }}_${{ matrix.test.app }}
6767
path: ${{ env.TEST_DIR }}/ci/
68-
- name: Install Python packages
69-
env:
70-
PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
71-
run: |
72-
pip install --only-binary cryptography --extra-index-url https://dl.espressif.com/pypi/ -r $GITHUB_WORKSPACE/ci/requirements.txt
7368
- name: Run Example Test on target
7469
working-directory: ${{ env.TEST_DIR }}
7570
run: |
71+
export PYENV_ROOT="$HOME/.pyenv"
72+
export PATH="$PYENV_ROOT/bin:$PATH"
73+
eval "$(pyenv init --path)"
74+
eval "$(pyenv init -)"
75+
if ! pyenv versions --bare | grep -q '^3\.12\.6$'; then
76+
echo "Installing Python 3.12.6..."
77+
pyenv install -s 3.12.6
78+
fi
79+
if ! pyenv virtualenvs --bare | grep -q '^myenv$'; then
80+
echo "Creating pyenv virtualenv 'myenv'..."
81+
pyenv virtualenv 3.12.6 myenv
82+
fi
83+
pyenv activate myenv
84+
python --version
85+
pip install --only-binary cryptography --extra-index-url https://dl.espressif.com/pypi/ -r $GITHUB_WORKSPACE/ci/requirements.txt
7686
unzip ci/artifacts.zip -d ci
7787
for dir in `ls -d ci/build_*`; do
7888
rm -rf build sdkconfig.defaults

components/libwebsockets/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ version: "4.3.3"
22
url: https://github.com/espressif/esp-protocols/tree/master/components/libwebsockets
33
description: The component provides a simple ESP-IDF port of libwebsockets client.
44
dependencies:
5-
idf: '>=5.3'
5+
idf: '>=5.3,<6.0'

0 commit comments

Comments
 (0)