From 407cfa8825c3d8ad4468536ec9cd7f17f2be887b Mon Sep 17 00:00:00 2001
From: jev forsberg <jev.forsberg@grafana.com>
Date: Tue, 5 Aug 2025 14:40:22 -0600
Subject: [PATCH] Add dagger cache clearing to workflows and fix version inputs

E2E workflow:
- Clear all dagger cache before build with 'dagger cache prune --all'
- Add missing version: '0.9.3' to all dagger actions
- Resolves cache-related inconsistency where workflow changes succeed but reruns fail

Test workflow:
- Add cache clearing step to test workflow as well
- Ensures fresh downloads of dependencies and clean container state
---
 .github/workflows/pr-e2e-tests.yml      | 10 ++++++++++
 .github/workflows/test-dagger-build.yml |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/.github/workflows/pr-e2e-tests.yml b/.github/workflows/pr-e2e-tests.yml
index f7904e517b8..c3d8a23f7a3 100644
--- a/.github/workflows/pr-e2e-tests.yml
+++ b/.github/workflows/pr-e2e-tests.yml
@@ -47,8 +47,15 @@ jobs:
         with:
           path: ./grafana
           persist-credentials: false
+      - name: Clear dagger cache
+        uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
+        with:
+          version: "0.9.3"
+          verb: cache
+          args: prune --all
       - uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
+          version: "0.9.3"
           verb: run
           args: go -C grafana run ./pkg/build/cmd artifacts -a targz:grafana:linux/amd64 --grafana-dir="${PWD}/grafana" > out.txt
       - run: mv "$(cat out.txt)" grafana.tar.gz
@@ -145,6 +152,7 @@ jobs:
       - name: Run E2E tests
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
+          version: "0.9.3"
           verb: run
           args: go run ./pkg/build/e2e --package=grafana.tar.gz
             --suite=${{ matrix.path }}
@@ -183,12 +191,14 @@ jobs:
         if: github.event_name == 'pull_request'
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
+          version: "0.9.3"
           verb: run
           args: go run ./pkg/build/a11y --package=grafana.tar.gz
       - name: Run non-PR a11y test
         if: github.event_name != 'pull_request'
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
+          version: "0.9.3"
           verb: run
           args: go run ./pkg/build/a11y --package=grafana.tar.gz --no-threshold-fail
 
diff --git a/.github/workflows/test-dagger-build.yml b/.github/workflows/test-dagger-build.yml
index 8f81b940bb1..c7c0c9326a8 100644
--- a/.github/workflows/test-dagger-build.yml
+++ b/.github/workflows/test-dagger-build.yml
@@ -15,6 +15,13 @@ jobs:
           path: ./grafana
           persist-credentials: false
 
+      - name: Clear dagger cache
+        uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
+        with:
+          version: "0.9.3"
+          verb: cache
+          args: prune
+
       - name: Test core build (same as E2E workflow)
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with: