From 935b35551f1925402dbe894efe1ae1a7d8eb685f Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Mon, 20 May 2024 10:55:42 +0200
Subject: [PATCH 1/2] ci: use github repo for mac runners

---
 .gitlab/ci/build.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index d4272ebeb2..8cf25d6156 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -683,6 +683,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}
 
 test_build_system_spaces:
   extends: .test_build_system_template

From a1a279976779310c0aeb082a2e95a82d7154c020 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Tue, 21 May 2024 05:54:47 +0200
Subject: [PATCH 2/2] ci: make fast_template_app optional

---
 .gitlab/ci/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 8cf25d6156..8e977cb701 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -662,6 +662,7 @@ build_clang_test_apps_esp32c6:
   needs:
     - job: fast_template_app
       artifacts: false
+      optional: true
   script:
     - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
     - rm -rf test_build_system