Merge pull request #2654 from hathach/update-circleci

circle ci remove deps caching to reduce storage credit

3 files changed, 24 insertions, 44 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d4532aee..7b36bed7c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,14 +8,14 @@ commands:
         toolchain_url:
             type: string
     steps:
-      - run:
-          name: Make toolchain cache key
-          command: echo "<< parameters.toolchain >>-<< parameters.toolchain_url>>" > toolchain_key
-      - restore_cache:
-          name: Restore Toolchain Cache
-          key: deps-{{ checksum "toolchain_key" }}
-          paths:
-            - ~/cache/<< parameters.toolchain >>
+#      - run:
+#          name: Make toolchain cache key
+#          command: echo "<< parameters.toolchain >>-<< parameters.toolchain_url>>" > toolchain_key
+#      - restore_cache:
+#          name: Restore Toolchain Cache
+#          key: deps-{{ checksum "toolchain_key" }}
+#          paths:
+#            - ~/cache/<< parameters.toolchain >>
       - run:
           name: Install Toolchain
           command: |
@@ -25,11 +25,11 @@ commands:
               wget << parameters.toolchain_url>> -O toolchain.tar.gz
               tar -C ~/cache/<< parameters.toolchain >> -xaf toolchain.tar.gz
             fi
-      - save_cache:
-          name: Save Toolchain Cache
-          key: deps-{{ checksum "toolchain_key" }}
-          paths:
-            - ~/cache/<< parameters.toolchain >>
+#      - save_cache:
+#          name: Save Toolchain Cache
+#          key: deps-{{ checksum "toolchain_key" }}
+#          paths:
+#            - ~/cache/<< parameters.toolchain >>
       - run:
           name: Setup build environment
           command: |
@@ -45,29 +45,9 @@ commands:
         type: string
     steps:
       - run:
-          name: Make deps cache key
-          command: |
-            python tools/get_deps.py --print > deps_key
-      - restore_cache:
-          name: Restore Dependencies Cache
-          key: deps-{{ checksum "deps_key" }}
-          paths:
-            - lib/CMSIS_5
-            - lib/FreeRTOS-Kernel
-            - lib/lwip
-            - tools/uf2
-      - run:
           name: Get Dependencies
           command: |
             python tools/get_deps.py << parameters.family >>
-      - save_cache:
-          name: Save Dependencies Cache
-          key: deps-{{ checksum "deps_key" }}
-          paths:
-            - lib/CMSIS_5
-            - lib/FreeRTOS-Kernel
-            - lib/lwip
-            - tools/uf2
 
 jobs:
   arm-clang:
diff --git a/.github/actions/setup_toolchain/download/action.yml b/.github/actions/setup_toolchain/download/action.yml
index 0b35bddb1..2af456ef8 100644
--- a/.github/actions/setup_toolchain/download/action.yml
+++ b/.github/actions/setup_toolchain/download/action.yml
@@ -12,6 +12,7 @@ runs:
   using: "composite"
   steps:
     - name: Cache Toolchain
+      if: ${{ !startsWith(inputs.toolchain_url, 'https://github.com') }}
       uses: actions/cache@v4
       id: cache-toolchain-download
       with:
@@ -22,7 +23,7 @@ runs:
       if: steps.cache-toolchain-download.outputs.cache-hit != 'true'
       run: |
         mkdir -p ~/cache/${{ inputs.toolchain }}
-        wget --progress=dot:mega ${{ inputs.toolchain_url }} -O toolchain.tar.gz
+        wget --progress=dot:giga ${{ inputs.toolchain_url }} -O toolchain.tar.gz
         tar -C ~/cache/${{ inputs.toolchain }} -xaf toolchain.tar.gz
       shell: bash
 
diff --git a/.github/actions/setup_toolchain/espressif/action.yml b/.github/actions/setup_toolchain/espressif/action.yml
index 494b7910e..46da02911 100644
--- a/.github/actions/setup_toolchain/espressif/action.yml
+++ b/.github/actions/setup_toolchain/espressif/action.yml
@@ -11,32 +11,31 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - id: set-docker-image
+    - name: Set DOCKER_ESP_IDF
       run: |
-        DOCKER_IMAGE=$HOME/cache/${{ inputs.toolchain }}/docker_image.tar
-        echo "DOCKER_IMAGE=$DOCKER_IMAGE" >> $GITHUB_ENV
-        echo "DOCKER_IMAGE=$DOCKER_IMAGE" >> $GITHUB_OUTPUT
+        DOCKER_ESP_IDF=$HOME/cache/${{ inputs.toolchain }}/docker_image.tar
+        echo "DOCKER_ESP_IDF=$DOCKER_ESP_IDF" >> $GITHUB_ENV
       shell: bash
 
     - name: Cache Docker Image
       uses: actions/cache@v4
       id: cache-toolchain-espressif
       with:
-        path: ${{ steps.set-docker-image.outputs.DOCKER_IMAGE }}
+        path: ${{ env.DOCKER_ESP_IDF }}
         key: ${{ inputs.toolchain }}-${{ inputs.toolchain_url }}
 
     - name: Pull and Save Docker Image
       if: steps.cache-toolchain-espressif.outputs.cache-hit != 'true'
       run: |
         docker pull espressif/idf:${{ inputs.toolchain_url }}
-        mkdir -p ~/cache/${{ inputs.toolchain }}
-        docker save -o $DOCKER_IMAGE espressif/idf:${{ inputs.toolchain_url }}
-        du -sh $DOCKER_IMAGE
+        mkdir -p $(dirname $DOCKER_ESP_IDF)
+        docker save -o $DOCKER_ESP_IDF espressif/idf:${{ inputs.toolchain_url }}
+        du -sh $DOCKER_ESP_IDF
       shell: bash
 
     - name: Load Docker Image
       if: steps.cache-toolchain-espressif.outputs.cache-hit == 'true'
       run: |
-        du -sh $DOCKER_IMAGE
-        docker load --input $DOCKER_IMAGE
+        du -sh $DOCKER_ESP_IDF
+        docker load --input $DOCKER_ESP_IDF
       shell: bash