From ff015d1872bea16d3a3c8b7b3b61e8976bea486c Mon Sep 17 00:00:00 2001
From: Chen Yudong <chenyudong@espressif.com>
Date: Tue, 19 Dec 2023 16:19:50 +0800
Subject: [PATCH] ci: differnet cache key for different idf ver

update caches on release tags and nightly schedules
---
 .gitlab/ci/common.yml       | 8 ++++++--
 .gitlab/ci/rules.yml        | 8 +++++++-
 .gitlab/ci/target-test.yml  | 2 +-
 .gitlab/ci/upload_cache.yml | 4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index 3e64980d24..e858331898 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -329,11 +329,15 @@ default:
   cache:
     # pull only for most of the use cases since it's cache dir.
     # Only set "push" policy for "upload_cache" stage jobs
-    - key: pip-cache
+    - key: pip-cache-${LATEST_GIT_TAG}
+      fallback_keys:
+        - pip-cache
       paths:
         - .cache/pip
       policy: pull
-    - key: submodule-cache
+    - key: submodule-cache-${LATEST_GIT_TAG}
+      fallback_keys:
+        - submodule-cache
       paths:
         - .cache/submodule_archives
       policy: pull
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index ae688f66b5..871dc7a1bb 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -349,6 +349,9 @@
 .if-schedule: &if-schedule
   if: '$CI_PIPELINE_SOURCE == "schedule"'
 
+.if-schedule-nightly: &if-schedule-nightly
+  if: '$CI_PIPELINE_SOURCE == "schedule" && $INCLUDE_NIGHTLY_RUN == "1"'
+
 .if-schedule-test-build-system-windows: &if-schedule-test-build-system-windows
   if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_BUILD_SYSTEM_TEST_WIN == "true"'
 
@@ -405,7 +408,8 @@
 ### Patterns ###
 .rules:patterns:python-cache:
   rules:
-    - *if-schedule
+    - <<: *if-tag-release
+    - <<: *if-schedule-nightly
     - <<: *if-label-upload_cache
       when: manual
     - <<: *if-dev-push
@@ -413,6 +417,8 @@
 
 .rules:patterns:submodule:
   rules:
+    - <<: *if-tag-release
+    - <<: *if-schedule-nightly
     - <<: *if-label-upload_cache
       when: manual
     - <<: *if-dev-push
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index d8f8f9a490..8e7892eb11 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -7,7 +7,7 @@
   dependencies: []
   cache:
     # Usually do not need submodule-cache in target_test
-    - key: pip-cache
+    - key: pip-cache-${LATEST_GIT_TAG}
       paths:
         - .cache/pip
       policy: pull
diff --git a/.gitlab/ci/upload_cache.yml b/.gitlab/ci/upload_cache.yml
index b0a35ae4e1..30e49b545a 100644
--- a/.gitlab/ci/upload_cache.yml
+++ b/.gitlab/ci/upload_cache.yml
@@ -15,7 +15,7 @@ upload-pip-cache:
     - $GEO
     - cache
   cache:
-    key: pip-cache
+    key: pip-cache-${LATEST_GIT_TAG}
     paths:
       - .cache/pip
     policy: push
@@ -35,7 +35,7 @@ upload-submodules-cache:
     - $GEO
     - cache
   cache:
-    key: submodule-cache
+    key: submodule-cache-${LATEST_GIT_TAG}
     paths:
       - .cache/submodule_archives
     policy: push