feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'ci/fix_protobuf_version' into 'master'

Browse Source 
ci: fix protobuf 4.0 incompatible issue

See merge request espressif/esp-idf!18259
This commit is contained in:
Fu Hanxi
2022-05-26 20:07:06 +08:00
parent 37596b4dd8 e0a41cd816
commit 73be74fd71
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -218,7 +218,7 @@ before_script:
"pytest-embedded-qemu~=$PYTEST_EMBEDDED_VERSION" "pytest-embedded-qemu~=$PYTEST_EMBEDDED_VERSION"
pytest-rerunfailures pytest-rerunfailures
scapy scapy
google-api-python-client -r tools/esp_prov/requirements.txt
- export EXTRA_CFLAGS=${PEDANTIC_CFLAGS} - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
- export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS} - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}

2
tools/esp_prov/requirements.txt
View File

@@ -1,3 +1,3 @@
future future
protobuf protobuf<4.0.0 # IDFCI-1278
cryptography cryptography