Cache bootstrap step in the cirque workflow (#25112)

* Cache bootstrap step in the cirque workflow * Add timeout to bootstrap cache step It seems that dues to GitHub internal network issues, downloading cache blob can sometimes fail causing cache step to timeout after default 60 min timeout.
project-chip · Dec 20, 2023 · 365b2f0 · 365b2f0
1 parent d376ee5
commit 365b2f0
Show file tree

Hide file tree

Showing 32 changed files with 74 additions and 28 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -69,6 +69,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -185,6 +186,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -344,6 +346,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -402,6 +405,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -501,6 +505,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -46,6 +46,7 @@ jobs:
  run: scripts/checkout_submodules.py --shallow --platform linux
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -81,6 +82,7 @@ jobs:
  run: scripts/checkout_submodules.py --shallow --platform esp32
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -116,6 +118,7 @@ jobs:
  run: scripts/checkout_submodules.py --shallow --platform nrfconnect
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -31,7 +31,7 @@ jobs:
 
  env:
  DOCKER_RUN_VERSION: 0.6.35
- GITHUB_CACHE_PATH: /tmp/cirque-cache/
+ GITHUB_CACHE_PATH: /tmp/cirque-cache
 
  runs-on: ubuntu-latest
  if: github.actor != 'restyled-io[bot]'
@@ -60,33 +60,36 @@ jobs:
  - name: Checkout submodules
  run: scripts/checkout_submodules.py --shallow --platform linux
 
- - name: Get cirque cache key
- id: cirque-key
- run: |
- echo "::set-output name=val::$(scripts/tests/cirque_tests.sh cachekeyhash)"
-
- - name: Cache
- uses: actions/cache@v2
+ - name: Bootstrap cache
+ uses: actions/cache@v3
+ timeout-minutes: 10
  if: ${{ !env.ACT }}
- id: cache
  with:
- path: ${{ env.GITHUB_CACHE_PATH }}
- key: ${{ runner.os }}-cirque-${{ steps.cirque-key.outputs.val }}
- restore-keys: |
- ${{ runner.os }}-cirque-
-
+ key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
+ path: |
+ .environment
+ build_overrides/pigweed_environment.gni
  - name: Bootstrap
  timeout-minutes: 15
  run: |
  integrations/docker/images/chip-build-cirque/run.sh \
- --env GITHUB_ACTION_RUN=1 \
- --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
- --volume /tmp:/tmp \
- -- sh -c '\
- git config --global --add safe.directory "*" \
+ -- sh -c " \
+ git config --global --add safe.directory '*' \
  && scripts/build/gn_bootstrap.sh \
- '
+ && chown -R $(id -u):$(id -g) .environment \
+ "
 
+ - name: Get Cirque Bootstrap cache key
+ id: cirque-bootstrap-cache-key
+ run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
+ - name: Cirque Bootstrap cache
+ uses: actions/cache@v3
+ timeout-minutes: 10
+ if: ${{ !env.ACT }}
+ with:
+ key: ${{ runner.os }}-cirque-${{ steps.cirque-bootstrap-cache-key.outputs.val }}
+ restore-keys: ${{ runner.os }}-cirque-
+ path: ${{ env.GITHUB_CACHE_PATH }}
  - name: Cirque Bootstrap
  timeout-minutes: 15
  run: |
@@ -95,6 +98,7 @@ jobs:
  --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
  --volume /tmp:/tmp \
  -- scripts/tests/cirque_tests.sh bootstrap
+
  - name: Artifact suffix
  id: outsuffix
  uses: haya14busa/action-cond@v1
@@ -107,13 +111,10 @@ jobs:
  timeout-minutes: 30
  run: |
  integrations/docker/images/chip-build-cirque/run.sh \
- --env GITHUB_ACTION_RUN=1 \
- --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
- --volume /tmp:/tmp \
- -- sh -c '\
- git config --global --add safe.directory "*" \
- && scripts/build/gn_gen_cirque.sh
- '
+ -- sh -c " \
+ git config --global --add safe.directory '*' \
+ && scripts/build/gn_gen_cirque.sh \
+ "
  - name: Run Tests
  timeout-minutes: 45
  run: |
@@ -125,6 +126,7 @@ jobs:
  --volume /tmp:/tmp \
  --volume /dev/pts:/dev/pts \
  -- scripts/tests/cirque_tests.sh run_all_tests
+
  - name: Uploading Binaries
  uses: actions/upload-artifact@v3
  if: ${{ always() && !env.ACT }}

diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
@@ -68,6 +68,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
@@ -48,6 +48,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
@@ -52,6 +52,7 @@ jobs:
  run: scripts/checkout_submodules.py --shallow --platform ameba
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
@@ -59,6 +59,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -60,6 +60,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml
@@ -57,6 +57,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -65,6 +65,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -59,6 +59,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -175,6 +176,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -59,6 +59,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -61,6 +61,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
@@ -59,6 +59,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
@@ -51,6 +51,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -59,6 +59,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -75,6 +75,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
@@ -61,6 +61,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -76,6 +76,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
@@ -61,6 +61,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -61,6 +61,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -60,6 +60,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
@@ -54,6 +54,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
@@ -65,6 +65,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
@@ -56,6 +56,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -115,6 +116,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -57,6 +57,7 @@ jobs:
  run: scripts/checkout_submodules.py --shallow --platform linux
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
@@ -56,6 +56,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -45,6 +45,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |
@@ -99,6 +100,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |

diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
@@ -56,6 +56,7 @@ jobs:
 
  - name: Bootstrap cache
  uses: actions/cache@v3
+ timeout-minutes: 10
  with:
  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
  path: |