ci: get buildroot build cache working

LabNConsulting · Mar 11, 2024 · 9b9ba51 · 9b9ba51
1 parent 2d157e6
commit 9b9ba51
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -164,8 +164,11 @@ jobs:
         id: buildroot-cache
         uses: actions/cache@v4
         with:
-          path: output-buildroot.tar.gz
-          key: ${{ runner.os }}-br-${{ hashFiles('buildroot-ci.config', 'output-buildroot.tar.gz', 'root-key', 'root-key.pub') }}
+          path: |
+            output-buildroot
+            root-key
+            root-key.pub
+          key: ${{ runner.os }}-br-${{ hashFiles('buildroot-ci.config', 'buildroot/dl/**', 'output-buildroot/build/linux-custom/.config', 'output-buildroot/build/linux-custom/**/*.c', 'output-buildroot/build/linux-custom/**/*.h', 'root-key', 'root-key.pub') }}
           restore-keys: |
             key: ${{ runner.os }}-br-
 
@@ -208,15 +211,6 @@ jobs:
           retention-days: 30
           if-no-files-found: error
 
-      - name: Collect cache contents
-        timeout-minutes: 120
-        run: |
-          # tar up the remaining files including .ccache
-          echo "Collecting new cache contents: $(date)"
-          tar -czvf output-buildroot.tar.gz output-buildroot root-key root-key.pub || echo "error with tarball creation"
-          ls -hl output-buildroot.tar.gz || true
-          echo "Done collecting new cache contents: $(date)"
-
       - name: Archive buildroot rootfs.cpio.gz
         uses: actions/upload-artifact@v4
         with: