From ec09b45ca64947ba097f6cd86828e7957371fa9c Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 19 Nov 2025 10:50:53 +0100
Subject: [PATCH] ci: cleanup gcc_static_analyzer and `.rules:build`

---
 .gitlab/ci/build.yml                     | 18 +-----------------
 .gitlab/ci/dependencies/dependencies.yml |  3 ---
 .gitlab/ci/pre_check.yml                 | 11 +++++++++++
 .gitlab/ci/rules.yml                     | 19 +------------------
 4 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index eb73d8d585..7070e3d38d 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -38,7 +38,7 @@
 fast_template_app:
   extends:
     - .build_template_app_template
-    - .rules:build:target_test
+    - .rules:build
   stage: pre_check
   tags: [fast_run, shiny]
   variables:
@@ -54,22 +54,6 @@ build_template_app:
     - job: fast_template_app
       artifacts: false
 
-#######################
-# gnu_static_analyzer #
-#######################
-gcc_static_analyzer:
-  extends:
-    - .build_template_app_template
-    - .rules:build:target_test
-  stage: pre_check
-  tags: [build, shiny]
-  variables:
-    CI_CCACHE_DISABLE: 1
-    ANALYZING_APP: "examples/get-started/hello_world"
-  script:
-    - echo "CONFIG_COMPILER_STATIC_ANALYZER=y" >> ${ANALYZING_APP}/sdkconfig.defaults
-    - idf-build-apps build -p ${ANALYZING_APP}
-
 ########################################
 # Clang Build Apps Without Tests Cases #
 ########################################
diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index db447461b2..31fc506823 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -9,7 +9,6 @@
     - build_system
     - downloadable-tools
   included_in:
-    - build:target_test
     - build:check
 
 # -------------------
@@ -41,8 +40,6 @@
 "patterns:template-app":
   patterns:
     - build_template-app
-  included_in:
-    - build:target_test
 
 "patterns:build-check":
   patterns:
diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml
index 6921955d69..758bef51a4 100644
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -191,6 +191,17 @@ baseline_manifest_sha:
     expire_in: 1 week
     when: always
 
+gcc_static_analyzer:
+  extends:
+    - .pre_check_template
+    - .rules:build
+  variables:
+    CI_CCACHE_DISABLE: 1
+    ANALYZING_APP: "examples/get-started/hello_world"
+  script:
+    - echo "CONFIG_COMPILER_STATIC_ANALYZER=y" >> ${ANALYZING_APP}/sdkconfig.defaults
+    - idf-build-apps build -p ${ANALYZING_APP}
+
 redundant_pass_job:
   extends:
     - .pre_check_template
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index c5cc6fa0be..7277a94d79 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -41,9 +41,6 @@
   - "tools/idf_tools.py"
   - "tools/tools.json"
 
-.patterns-build_template-app: &patterns-build_template-app
-  - "tools/ci/build_template_app.sh"
-
 .patterns-build_system: &patterns-build_system
   - "tools/cmake/**/*"
   - "tools/cmakev2/**/*"
@@ -54,6 +51,7 @@
   - "tools/ci/ignore_build_warnings.txt"
   - "tools/ci/test_build_system*.sh"
   - "tools/ci/test_build_system*.py"
+  - "tools/ci/build_template_app.sh"
   - "tools/test_build_system/**/*"
 
 .patterns-build_system_win: &patterns-build_system_win
@@ -348,21 +346,6 @@
     - <<: *if-label-macos
     - <<: *if-label-macos_test
 
-.rules:build:target_test:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build
-    - <<: *if-dev-push
-      changes: *patterns-build_components
-    - <<: *if-dev-push
-      changes: *patterns-build_system
-    - <<: *if-dev-push
-      changes: *patterns-build_template-app
-    - <<: *if-dev-push
-      changes: *patterns-downloadable-tools
-
 .rules:labels:buildv2:
   rules:
     - <<: *if-revert-branch