Skip to content

Commit a1abbd7

Browse files
authored
Merge pull request #2654 from hathach/update-circleci
circle ci remove deps caching to reduce storage credit
2 parents a068b81 + 1d7aeb3 commit a1abbd7

File tree

3 files changed

+24
-44
lines changed

3 files changed

+24
-44
lines changed

.circleci/config.yml

+13-33
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ commands:
88
toolchain_url:
99
type: string
1010
steps:
11-
- run:
12-
name: Make toolchain cache key
13-
command: echo "<< parameters.toolchain >>-<< parameters.toolchain_url>>" > toolchain_key
14-
- restore_cache:
15-
name: Restore Toolchain Cache
16-
key: deps-{{ checksum "toolchain_key" }}
17-
paths:
18-
- ~/cache/<< parameters.toolchain >>
11+
# - run:
12+
# name: Make toolchain cache key
13+
# command: echo "<< parameters.toolchain >>-<< parameters.toolchain_url>>" > toolchain_key
14+
# - restore_cache:
15+
# name: Restore Toolchain Cache
16+
# key: deps-{{ checksum "toolchain_key" }}
17+
# paths:
18+
# - ~/cache/<< parameters.toolchain >>
1919
- run:
2020
name: Install Toolchain
2121
command: |
@@ -25,11 +25,11 @@ commands:
2525
wget << parameters.toolchain_url>> -O toolchain.tar.gz
2626
tar -C ~/cache/<< parameters.toolchain >> -xaf toolchain.tar.gz
2727
fi
28-
- save_cache:
29-
name: Save Toolchain Cache
30-
key: deps-{{ checksum "toolchain_key" }}
31-
paths:
32-
- ~/cache/<< parameters.toolchain >>
28+
# - save_cache:
29+
# name: Save Toolchain Cache
30+
# key: deps-{{ checksum "toolchain_key" }}
31+
# paths:
32+
# - ~/cache/<< parameters.toolchain >>
3333
- run:
3434
name: Setup build environment
3535
command: |
@@ -44,30 +44,10 @@ commands:
4444
family:
4545
type: string
4646
steps:
47-
- run:
48-
name: Make deps cache key
49-
command: |
50-
python tools/get_deps.py --print > deps_key
51-
- restore_cache:
52-
name: Restore Dependencies Cache
53-
key: deps-{{ checksum "deps_key" }}
54-
paths:
55-
- lib/CMSIS_5
56-
- lib/FreeRTOS-Kernel
57-
- lib/lwip
58-
- tools/uf2
5947
- run:
6048
name: Get Dependencies
6149
command: |
6250
python tools/get_deps.py << parameters.family >>
63-
- save_cache:
64-
name: Save Dependencies Cache
65-
key: deps-{{ checksum "deps_key" }}
66-
paths:
67-
- lib/CMSIS_5
68-
- lib/FreeRTOS-Kernel
69-
- lib/lwip
70-
- tools/uf2
7151
7252
jobs:
7353
arm-clang:

.github/actions/setup_toolchain/download/action.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ runs:
1212
using: "composite"
1313
steps:
1414
- name: Cache Toolchain
15+
if: ${{ !startsWith(inputs.toolchain_url, 'https://github.com') }}
1516
uses: actions/cache@v4
1617
id: cache-toolchain-download
1718
with:
@@ -22,7 +23,7 @@ runs:
2223
if: steps.cache-toolchain-download.outputs.cache-hit != 'true'
2324
run: |
2425
mkdir -p ~/cache/${{ inputs.toolchain }}
25-
wget --progress=dot:mega ${{ inputs.toolchain_url }} -O toolchain.tar.gz
26+
wget --progress=dot:giga ${{ inputs.toolchain_url }} -O toolchain.tar.gz
2627
tar -C ~/cache/${{ inputs.toolchain }} -xaf toolchain.tar.gz
2728
shell: bash
2829

.github/actions/setup_toolchain/espressif/action.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,31 @@ inputs:
1111
runs:
1212
using: "composite"
1313
steps:
14-
- id: set-docker-image
14+
- name: Set DOCKER_ESP_IDF
1515
run: |
16-
DOCKER_IMAGE=$HOME/cache/${{ inputs.toolchain }}/docker_image.tar
17-
echo "DOCKER_IMAGE=$DOCKER_IMAGE" >> $GITHUB_ENV
18-
echo "DOCKER_IMAGE=$DOCKER_IMAGE" >> $GITHUB_OUTPUT
16+
DOCKER_ESP_IDF=$HOME/cache/${{ inputs.toolchain }}/docker_image.tar
17+
echo "DOCKER_ESP_IDF=$DOCKER_ESP_IDF" >> $GITHUB_ENV
1918
shell: bash
2019

2120
- name: Cache Docker Image
2221
uses: actions/cache@v4
2322
id: cache-toolchain-espressif
2423
with:
25-
path: ${{ steps.set-docker-image.outputs.DOCKER_IMAGE }}
24+
path: ${{ env.DOCKER_ESP_IDF }}
2625
key: ${{ inputs.toolchain }}-${{ inputs.toolchain_url }}
2726

2827
- name: Pull and Save Docker Image
2928
if: steps.cache-toolchain-espressif.outputs.cache-hit != 'true'
3029
run: |
3130
docker pull espressif/idf:${{ inputs.toolchain_url }}
32-
mkdir -p ~/cache/${{ inputs.toolchain }}
33-
docker save -o $DOCKER_IMAGE espressif/idf:${{ inputs.toolchain_url }}
34-
du -sh $DOCKER_IMAGE
31+
mkdir -p $(dirname $DOCKER_ESP_IDF)
32+
docker save -o $DOCKER_ESP_IDF espressif/idf:${{ inputs.toolchain_url }}
33+
du -sh $DOCKER_ESP_IDF
3534
shell: bash
3635

3736
- name: Load Docker Image
3837
if: steps.cache-toolchain-espressif.outputs.cache-hit == 'true'
3938
run: |
40-
du -sh $DOCKER_IMAGE
41-
docker load --input $DOCKER_IMAGE
39+
du -sh $DOCKER_ESP_IDF
40+
docker load --input $DOCKER_ESP_IDF
4241
shell: bash

0 commit comments

Comments
 (0)