root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 243 Packages Projects Releases Wiki Activity

[release-12.0.5] CI: pin dagger version to match go.mod (#110643) 

CI: pin dagger version to match go.mod (#110638)

* pin dagger version to match go.mod

* set in e2e too

(cherry picked from commit 4810e51743)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
This commit is contained in:
Alex Spencer 2025-09-05 03:45:39 -07:00 committed by GitHub
parent cd1a52454f
commit 323a4a24fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/build-package/action.yml vendored
View File

@ -139,6 +139,7 @@ runs:
with: with:
verb: run verb: run
dagger-flags: --verbose=0 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 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 - id: output
shell: bash shell: bash

4
.github/workflows/pr-e2e-tests.yml vendored
View File

@ -48,6 +48,7 @@ jobs:
persist-credentials: false persist-credentials: false
- uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e - uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
with: with:
version: 0.18.8
verb: run verb: run
args: go -C grafana run ./pkg/build/cmd artifacts -a targz:grafana:linux/amd64 --grafana-dir="${PWD}/grafana" > out.txt 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 - run: mv "$(cat out.txt)" grafana.tar.gz
@ -140,6 +141,7 @@ jobs:
- name: Run E2E tests - name: Run E2E tests
uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
with: with:
version: 0.18.8
verb: run verb: run
args: go run ./pkg/build/e2e --package=grafana.tar.gz args: go run ./pkg/build/e2e --package=grafana.tar.gz
--suite=${{ matrix.path }} --suite=${{ matrix.path }}
@ -178,12 +180,14 @@ jobs:
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'
uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
with: with:
version: 0.18.8
verb: run verb: run
args: go run ./pkg/build/a11y --package=grafana.tar.gz args: go run ./pkg/build/a11y --package=grafana.tar.gz
- name: Run non-PR a11y test - name: Run non-PR a11y test
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
with: with:
version: 0.18.8
verb: run verb: run
args: go run ./pkg/build/a11y --package=grafana.tar.gz --no-threshold-fail args: go run ./pkg/build/a11y --package=grafana.tar.gz --no-threshold-fail

1
.github/workflows/release-pr.yml vendored
View File

@ -198,6 +198,7 @@ jobs:
if: ${{ inputs.bump == true || inputs.bump == 'true' }} if: ${{ inputs.bump == true || inputs.bump == 'true' }}
uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
with: with:
version: 0.18.8
verb: run verb: run
args: go run -C .grafana-main ./pkg/build/actions/bump-version -version="patch" args: go run -C .grafana-main ./pkg/build/actions/bump-version -version="patch"

1
pkg/build/actions/bump-version/action.yml
View File

@ -16,6 +16,7 @@ runs:
GO_MOD_DIR: ${{ inputs.go-mod-dir }} GO_MOD_DIR: ${{ inputs.go-mod-dir }}
VERSION: ${{ inputs.version }} VERSION: ${{ inputs.version }}
with: with:
version: 0.18.8
verb: run verb: run
args: go run ./pkg/build/actions/bump-version -version=${VERSION} args: go run ./pkg/build/actions/bump-version -version=${VERSION}
- name: make gen-cue - name: make gen-cue