From f8fcd6b2fba307d523c8881f0bd19dddfa3a783e Mon Sep 17 00:00:00 2001 From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com> Date: Fri, 5 Sep 2025 03:45:29 -0700 Subject: [PATCH] [release-12.1.2] CI: pin dagger version to match go.mod (#110645) CI: pin dagger version to match go.mod (#110638) * pin dagger version to match go.mod * set in e2e too (cherry picked from commit 4810e51743306a4fc91400a931377365553292b2) Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com> --- .github/actions/build-package/action.yml | 1 + .github/workflows/pr-e2e-tests.yml | 4 ++++ .github/workflows/release-pr.yml | 1 + pkg/build/actions/bump-version/action.yml | 1 + 4 files changed, 7 insertions(+) diff --git a/.github/actions/build-package/action.yml b/.github/actions/build-package/action.yml index 123484071e7..dd5aaa13650 100644 --- a/.github/actions/build-package/action.yml +++ b/.github/actions/build-package/action.yml @@ -139,6 +139,7 @@ runs: with: verb: run dagger-flags: --verbose=0 + version: 0.18.8 args: go run -C ${GRAFANA_PATH} ./pkg/build/cmd artifacts --artifacts ${ARTIFACTS} --grafana-dir=${GRAFANA_PATH} --alpine-base=${ALPINE_BASE} --ubuntu-base=${UBUNTU_BASE} --enterprise-dir=${ENTERPRISE_PATH} --version=${VERSION} --patches-repo=${PATCHES_REPO} --patches-ref=${PATCHES_REF} --patches-path=${PATCHES_PATH} --build-id=${BUILD_ID} --tag-format="${TAG_FORMAT}" --ubuntu-tag-format="${UBUNTU_TAG_FORMAT}" --org=${DOCKER_ORG} --registry=${DOCKER_REGISTRY} --checksum=${CHECKSUM} --verify=${VERIFY} > $OUTFILE - id: output shell: bash diff --git a/.github/workflows/pr-e2e-tests.yml b/.github/workflows/pr-e2e-tests.yml index ec74716f7e3..30f6fd0d169 100644 --- a/.github/workflows/pr-e2e-tests.yml +++ b/.github/workflows/pr-e2e-tests.yml @@ -48,6 +48,7 @@ jobs: persist-credentials: false - uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e with: + 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 @@ -140,6 +141,7 @@ jobs: - name: Run E2E tests uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e with: + version: 0.18.8 verb: run args: go run ./pkg/build/e2e --package=grafana.tar.gz --suite=${{ matrix.path }} @@ -178,12 +180,14 @@ jobs: if: github.event_name == 'pull_request' uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e with: + 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.18.8 verb: run args: go run ./pkg/build/a11y --package=grafana.tar.gz --no-threshold-fail diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index 06a644f5843..70191ce224d 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -198,6 +198,7 @@ jobs: if: ${{ inputs.bump == true || inputs.bump == 'true' }} uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e with: + version: 0.18.8 verb: run args: go run -C .grafana-main ./pkg/build/actions/bump-version -version="patch" diff --git a/pkg/build/actions/bump-version/action.yml b/pkg/build/actions/bump-version/action.yml index d7d6fdf5c50..601159bf8ee 100644 --- a/pkg/build/actions/bump-version/action.yml +++ b/pkg/build/actions/bump-version/action.yml @@ -16,6 +16,7 @@ runs: GO_MOD_DIR: ${{ inputs.go-mod-dir }} VERSION: ${{ inputs.version }} with: + version: 0.18.8 verb: run args: go run ./pkg/build/actions/bump-version -version=${VERSION} - name: make gen-cue