mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'fix/gitlab_esptool_install' into 'release/v5.4'
CI: Use overwritten IDF_TOOLS_PATH See merge request espressif/esp-idf!49162
This commit is contained in:
@@ -142,8 +142,8 @@ variables:
|
|||||||
# download constraint file for dev
|
# download constraint file for dev
|
||||||
if [[ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]]; then
|
if [[ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]]; then
|
||||||
wget -O /tmp/constraint.txt --header="Authorization:Bearer ${ESPCI_TOKEN}" ${GITLAB_HTTP_SERVER}/api/v4/projects/2581/repository/files/${CI_PYTHON_CONSTRAINT_FILE}/raw?ref=${CI_PYTHON_CONSTRAINT_BRANCH}
|
wget -O /tmp/constraint.txt --header="Authorization:Bearer ${ESPCI_TOKEN}" ${GITLAB_HTTP_SERVER}/api/v4/projects/2581/repository/files/${CI_PYTHON_CONSTRAINT_FILE}/raw?ref=${CI_PYTHON_CONSTRAINT_BRANCH}
|
||||||
mkdir -p ~/.espressif
|
mkdir -p "${IDF_TOOLS_PATH:-$HOME/.espressif}"
|
||||||
mv /tmp/constraint.txt ~/.espressif/${CI_PYTHON_CONSTRAINT_FILE}
|
mv /tmp/constraint.txt "${IDF_TOOLS_PATH:-$HOME/.espressif}/${CI_PYTHON_CONSTRAINT_FILE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Mirror
|
# Mirror
|
||||||
@@ -194,7 +194,7 @@ variables:
|
|||||||
# we need the latest DEV release for esptool to be installed in every job without bumping the minimal requirement in
|
# we need the latest DEV release for esptool to be installed in every job without bumping the minimal requirement in
|
||||||
# the constraint file.
|
# the constraint file.
|
||||||
section_start "esptool_upgrade" "Upgrade esptool to the latest development version"
|
section_start "esptool_upgrade" "Upgrade esptool to the latest development version"
|
||||||
pip install --upgrade --pre esptool -c ~/.espressif/${CI_PYTHON_CONSTRAINT_FILE}
|
pip install --upgrade --pre esptool -c "${IDF_TOOLS_PATH:-$HOME/.espressif}/${CI_PYTHON_CONSTRAINT_FILE}"
|
||||||
section_end "esptool_upgrade"
|
section_end "esptool_upgrade"
|
||||||
|
|
||||||
# Custom clang toolchain
|
# Custom clang toolchain
|
||||||
|
|||||||
Reference in New Issue
Block a user