From 02b59a5d9ffc677db605989f9329ff527611e503 Mon Sep 17 00:00:00 2001 From: jev forsberg Date: Tue, 5 Aug 2025 15:05:08 -0600 Subject: [PATCH] Fix: Update dagger version to 0.11.8 for 11.4.8 API compatibility - Changes dagger version from 0.9.3 to 0.11.8 to match original 11.4.8 release - Fixes export API type mismatch: v0.11.8 returns (bool, error) vs v0.18.8 (string, error) - Resolves final 5% blocker: 'json: cannot unmarshal bool into Go value of type string' - Updated pr-e2e-tests.yml and test-dagger-build.yml for consistency - Maintains cache-busting environment variable for reliability --- .github/workflows/pr-e2e-tests.yml | 8 +++---- .github/workflows/test-dagger-build.yml | 29 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) create 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 360102ffb84..7fcc366ac52 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.9.3" + version: "0.11.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.9.3" + version: "0.11.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.9.3" + version: "0.11.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.9.3" + version: "0.11.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 new file mode 100644 index 00000000000..c7fa60d869c --- /dev/null +++ b/.github/workflows/test-dagger-build.yml @@ -0,0 +1,29 @@ +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: Test core build (same as E2E workflow) + uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e + with: + version: "0.11.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 + - name: Check if artifacts were created + run: | + ls -la grafana.tar.gz + echo "Core build completed successfully!"