From e19478c30c0abe046b14666b8e321ed2ffdea898 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Mon, 20 May 2024 10:55:42 +0200 Subject: [PATCH 1/2] ci: use github repo for mac runners --- tools/ci/config/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index 3a113f2bfa..248a9d2e86 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -319,6 +319,18 @@ test_build_system_cmake_macos: - macos_shell variables: SHELL_TEST_SCRIPT: test_build_system_cmake.sh + script: + - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh + - rm -rf test_build_system + - mkdir test_build_system + - cd test_build_system + # copy-paste the script from .test_build_system_template + # since `ESP_IDF_TEMPLATE_GIT` is a group variable and has higher precedence than job variable + # export here to override the group variable + # + # Clone the template app from github for macos runners + - export ESP_IDF_TEMPLATE_GIT="https://github.com/espressif/esp-idf-template.git" + - ${IDF_PATH}/tools/ci/${SHELL_TEST_SCRIPT} build_docker: extends: From 015fcc765f12d310c571145199fdee67e2a7db99 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Tue, 21 May 2024 05:54:47 +0200 Subject: [PATCH 2/2] ci: make fast_template_app optional --- tools/ci/config/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index 248a9d2e86..1a4bd4e44c 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -293,6 +293,7 @@ build_docs_pdf: needs: - job: fast_template_app artifacts: false + optional: true script: - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh - rm -rf test_build_system