mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Revert "ci: fix build_docker for merge result pipelines" 

This reverts commit f3bb09e46c.
pull/7830/head
Anton Maklakov 2021-10-28 13:20:43 +07:00
rodzic 0d81eb9855
commit b8790cfc85
1 zmienionych plików z 1 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
.gitlab/ci/build.yml
Wyświetl plik

@ -362,9 +362,7 @@ build_docker:
- export LOCAL_CI_REPOSITORY_URL=$CI_REPOSITORY_URL
- if [ -n "$LOCAL_GITLAB_HTTPS_HOST" ]; then export LOCAL_CI_REPOSITORY_URL="https://gitlab-ci-token:${CI_JOB_TOKEN}@${LOCAL_GITLAB_HTTPS_HOST}/${CI_PROJECT_PATH}"; fi
- echo "Using repository at $LOCAL_CI_REPOSITORY_URL"
# for merge request pipelines, use $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME. for other types (like master pipelines or scheduled ones), use $CI_COMMIT_REF_NAME
- if [ -n "${CI_OPEN_MERGE_REQUESTS}" ]; then REF_NAME=${CI_COMMIT_REF_NAME}; else REF_NAME=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}; fi
- export DOCKER_BUILD_ARGS="--build-arg IDF_CLONE_URL=${LOCAL_CI_REPOSITORY_URL} --build-arg IDF_CLONE_BRANCH_OR_TAG=${REF_NAME} --build-arg IDF_CHECKOUT_REF=${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
- export DOCKER_BUILD_ARGS="--build-arg IDF_CLONE_URL=${LOCAL_CI_REPOSITORY_URL} --build-arg IDF_CLONE_BRANCH_OR_TAG=${CI_COMMIT_REF_NAME} --build-arg IDF_CHECKOUT_REF=${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
# Build
- docker build --tag ${DOCKER_TMP_IMAGE_NAME} ${DOCKER_BUILD_ARGS} tools/docker/
# We can't mount $PWD/examples/get-started/blink into the container, see https://gitlab.com/gitlab-org/gitlab-ce/issues/41227.