From 30268cd18948e0c13d9c9448f49d2bc9f8a68da4 Mon Sep 17 00:00:00 2001
From: jev forsberg <jev.forsberg@grafana.com>
Date: Tue, 5 Aug 2025 15:20:14 -0600
Subject: [PATCH] Fix: Correct dagger version to 0.18.8 for migrated build
 system compatibility

- The migrated build system code (from 11.5.8) expects dagger v0.18.8 API
- Previous attempt used v0.11.8 (original 11.4.8) but build code was already modernized
- Fixes: 'json: cannot unmarshal bool into Go value of type string' export error
- v0.18.8 Export() returns (string, error) as expected by migrated code
- Completes final 5% blocker for 11.4.8 migration
---
 .github/workflows/pr-e2e-tests.yml      | 8 ++++----
 .github/workflows/test-dagger-build.yml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pr-e2e-tests.yml b/.github/workflows/pr-e2e-tests.yml
index 7fcc366ac52..a5b08353829 100644
--- a/.github/workflows/pr-e2e-tests.yml
+++ b/.github/workflows/pr-e2e-tests.yml
@@ -50,7 +50,7 @@ jobs:
         env:
           CACHE_BUSTER: ${{ github.run_number }}-${{ github.sha }}
         with:
-          version: "0.11.8"
+          version: "0.18.8"
           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
@@ -147,7 +147,7 @@ jobs:
       - name: Run E2E tests
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
-          version: "0.11.8"
+          version: "0.18.8"
           verb: run
           args: go run ./pkg/build/e2e --package=grafana.tar.gz
             --suite=${{ matrix.path }}
@@ -186,14 +186,14 @@ jobs:
         if: github.event_name == 'pull_request'
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
-          version: "0.11.8"
+          version: "0.18.8"
           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.11.8"
+          version: "0.18.8"
           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 c7fa60d869c..76cf86f02ec 100644
--- a/.github/workflows/test-dagger-build.yml
+++ b/.github/workflows/test-dagger-build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Test core build (same as E2E workflow)
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
-          version: "0.11.8"
+          version: "0.18.8"
           verb: run
           args: go -C grafana run ./pkg/build/cmd artifacts -a targz:grafana:linux/amd64 --grafana-dir="${PWD}/grafana" > out.txt