From a9476c26e08995ce0ce88edb43eb062c16f0f980 Mon Sep 17 00:00:00 2001
From: jev forsberg <jev.forsberg@grafana.com>
Date: Tue, 5 Aug 2025 14:43:55 -0600
Subject: [PATCH] Fix dagger cache command and remove test workflow

- Remove 'dagger cache prune' which doesn't exist in dagger 0.9.3
- Add CACHE_BUSTER environment variable to E2E workflow for cache invalidation
- Delete test-dagger-build.yml workflow as it's no longer needed
- Use combination of run_number and commit SHA for unique cache keys
---
 .github/workflows/pr-e2e-tests.yml      | 15 ++++-------
 .github/workflows/test-dagger-build.yml | 36 -------------------------
 2 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/test-dagger-build.yml

diff --git a/.github/workflows/pr-e2e-tests.yml b/.github/workflows/pr-e2e-tests.yml
index c3d8a23f7a3..360102ffb84 100644
--- a/.github/workflows/pr-e2e-tests.yml
+++ b/.github/workflows/pr-e2e-tests.yml
@@ -7,10 +7,9 @@ on:
       - main
       - release-*.*.*
 
-# Temporarily disabled concurrency to bypass stuck workflow
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref }}
-#   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 
 permissions: {}
 
@@ -47,13 +46,9 @@ 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
+        env:
+          CACHE_BUSTER: ${{ github.run_number }}-${{ github.sha }}
         with:
           version: "0.9.3"
           verb: run
diff --git a/.github/workflows/test-dagger-build.yml b/.github/workflows/test-dagger-build.yml
deleted file mode 100644
index c7c0c9326a8..00000000000
--- a/.github/workflows/test-dagger-build.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Test Dagger Build Only
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - baldm0mma/bp_infra_11.4.8
-
-jobs:
-  test-dagger-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        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
-
-      - name: Test core build (same as E2E workflow)
-        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
-      - name: Check if artifacts were created
-        run: |
-          ls -la grafana.tar.gz
-          echo "Core build completed successfully!"