From ea77cc85c907707db78156d760e41cf42706d851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Zwoli=C5=84ski?= <mac.zwolinski@gmail.com>
Date: Thu, 16 Jan 2025 15:28:49 +0100
Subject: [PATCH] chore(ci): fix docker cache overwriting (#513)

---
 .github/actions/local-devnet/action.yml | 49 +++++++++----------------
 .github/workflows/ci.yml                |  8 ++--
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/.github/actions/local-devnet/action.yml b/.github/actions/local-devnet/action.yml
index 53202162..273146c5 100644
--- a/.github/actions/local-devnet/action.yml
+++ b/.github/actions/local-devnet/action.yml
@@ -9,48 +9,33 @@ runs:
       uses: actions/cache@v4
       with:
         path: ${{ runner.temp }}/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-${{ hashFiles('./ci/Dockerfile*', './ci/*.yml', './ci/*.sh') }}
         restore-keys: |
           ${{ runner.os }}-buildx-
 
     - name: Build the docker-compose stack
       shell: bash
       run: |
-        cache_from="type=local,src=${{ runner.temp }}/.buildx-cache"
-        cache_to="type=local,dest=${{ runner.temp }}/.buildx-cache-new,mode=max"
-        cat > ci/cache.json <<EOF
-        {
-          "target": {
-            "validator": {
-              "cache-from": ["$cache_from,scope=validator"],
-              "cache-to": ["$cache_to,scope=validator"],
-              "output": ["type=docker"]
-            },
-            "bridge-0": {
-              "cache-from": ["$cache_from,scope=bridge-0"],
-              "cache-to": ["$cache_to,scope=bridge-0"],
-              "output": ["type=docker"]
-            },
-            "bridge-1": {
-              "cache-from": ["$cache_from,scope=bridge-1"],
-              "cache-to": ["$cache_to,scope=bridge-1"],
-              "output": ["type=docker"]
-            },
-            "grpcwebproxy": {
-              "cache-from": ["$cache_from,scope=grpcwebproxy"],
-              "cache-to": ["$cache_to,scope=grpcwebproxy"],
-              "output": ["type=docker"]
-            }
-          }
-        }
-        EOF
-        cd ci && docker buildx bake --file docker-compose.yml --file cache.json --load
+        mkdir -p ${{ runner.temp }}/.buildx-cache-new
+        cd ci
+        for image in "validator" "bridge" "grpcwebproxy"; do
+          docker buildx build \
+            --file "Dockerfile.$image" \
+            --tag "$image" \
+            --load \
+            --cache-from="type=local,src=${{ runner.temp }}/.buildx-cache/$image" \
+            --cache-to="type=local,dest=${{ runner.temp }}/.buildx-cache-new/$image" \
+            . &
+        done
+        wait $(jobs -p)
 
-    # Needed because otherwise cache would grow indefinitely
+    # Needed because otherwise cache would grow infinitely
     # https://github.com/moby/buildkit/issues/1896
     - name: Overwrite cache
       shell: bash
-      run: mv ${{ runner.temp }}/.buildx-cache-new ${{ runner.temp }}/.buildx-cache
+      run: |
+        rm -rf ${{ runner.temp }}/.buildx-cache
+        mv ${{ runner.temp }}/.buildx-cache-new ${{ runner.temp }}/.buildx-cache
 
     - name: Run the docker-compose stack
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eec32e18..be200848 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,9 +37,6 @@ jobs:
         target: wasm32-unknown-unknown
         cache-key: ${{ matrix.crate }}
 
-    - name: Celestia devnet
-      uses: ./.github/actions/local-devnet
-
     - name: Run clippy for native
       run: cargo clippy --all-targets --all-features -p ${{ matrix.crate }} -- --no-deps
 
@@ -79,7 +76,7 @@ jobs:
       run: cargo test --all-features -p ${{ matrix.crate }}
 
 
-  wasm-test:
+  test-wasm:
     runs-on: ubuntu-latest
 
     strategy:
@@ -209,6 +206,7 @@ jobs:
     - name: Check for unused dependencies
       run: cargo udeps --all-targets --all-features
 
+
   required:
     runs-on: ubuntu-latest
     name: Required checks
@@ -216,7 +214,7 @@ jobs:
     needs:
     - clippy
     - test
-    - wasm-test
+    - test-wasm
     - build-wasm
     - fmt
     - docs