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

Merge branch 'ci/fix-custom-oocd-setting_v5.1' into 'release/v5.1'

Browse Source 
ci: select OpenOCD binary based on runner (v5.1)

See merge request espressif/esp-idf!39380
This commit is contained in:
Alexey Gerenkov
2025-06-09 23:15:37 +08:00
parent f1d4845431 7db4075820
commit 0cd6fcf9f1
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@@ -171,7 +171,14 @@ cache:
source ./export.sh source ./export.sh
# Custom OpenOCD # Custom OpenOCD
if [[ ! -z "$OOCD_DISTRO_URL" && "$CI_JOB_STAGE" == "target_test" ]]; then if [[ "$CI_JOB_STAGE" == "target_test" ]]; then
machine="$(uname -m)"
if [[ "$machine" == "armv7l" ]] ; then
OOCD_DISTRO_URL="$OOCD_DISTRO_URL_ARMHF"
elif [[ "$machine" == "aarch64" ]] ; then
OOCD_DISTRO_URL="$OOCD_DISTRO_URL_ARM64"
fi
if [[ ! -z "$OOCD_DISTRO_URL" ]]; then
echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}" echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}"
wget $OOCD_DISTRO_URL wget $OOCD_DISTRO_URL
ARCH_NAME=$(basename $OOCD_DISTRO_URL) ARCH_NAME=$(basename $OOCD_DISTRO_URL)
@@ -179,6 +186,7 @@ cache:
export OPENOCD_SCRIPTS=$PWD/openocd-esp32/share/openocd/scripts export OPENOCD_SCRIPTS=$PWD/openocd-esp32/share/openocd/scripts
export PATH=$PWD/openocd-esp32/bin:$PATH export PATH=$PWD/openocd-esp32/bin:$PATH
fi fi
fi
if [[ -n "$CI_PYTHON_TOOL_REPO" ]]; then if [[ -n "$CI_PYTHON_TOOL_REPO" ]]; then
git clone --quiet --depth=1 -b ${CI_PYTHON_TOOL_BRANCH} https://gitlab-ci-token:${ESPCI_TOKEN}@${GITLAB_HTTPS_HOST}/espressif/${CI_PYTHON_TOOL_REPO}.git git clone --quiet --depth=1 -b ${CI_PYTHON_TOOL_BRANCH} https://gitlab-ci-token:${ESPCI_TOKEN}@${GITLAB_HTTPS_HOST}/espressif/${CI_PYTHON_TOOL_REPO}.git