* separate playwright into its own folder * better separation * add login scenario, add tags * remove ui option * update CODEOWNERS * add a panels suite test * migrate queries test to playwright * rename + add dashlist test * add panelEdit_base * add geomap map controls test * add geomap-layer-types * add geomap-spatial-operations tests * add frontend-sandbox-panel tests * add smoke-tests-suite * add comment about adding datasource * add dashboard-browse-nested * add dashboard-browse * add dashboard-export-json * add dashboard-keybindings test * remove @wip tag * turn on screenshots and add comment for why this test fails * add dashboard-links-without-slug test * try adding permissions in the test as well * add dashboard-live-streaming * context in the test doesn't work - sad * create dashboard-public-templating * add dashboard-public-create and make live streaming more resilient * add share externally test * add dashboard-share-internally * add share-snapshot-create test * add dashboard-templating * add timepicker tests * add embedded-dashboard test * add general_dashboards test * add import-dashboard test * add load-options-from-url test * add new-constant-variable test * add custom-variable test * add new-datasource-variable test * add new-interval-variable test * add text-box-variable test * add new-query-variable test * add horizontal repeat test * add panel-vertical-repeat test * add empty-row-repeat test * add set-options-from-ui test * add snapshot-create test * add templating test * add textbox-variables test * add cloud-plugins-suite * add storybook verification tests * add playwright storybook verification workflow * add playwright browsers * update CODEOWNERS * test change to trigger storybook verification workflows * try container instead * get the version right... * go back to installing - less chance of forgetting to update * Basic Github Actions Squashed commit of the following: commitf84c650a71Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 13:23:46 2025 +0100 add arg for sharding, but not using it yet commit7bcf0512c6Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 12:30:30 2025 +0100 less newline commitb643911882Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 12:24:31 2025 +0100 less logs commit38f871e9c2Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 10:00:26 2025 +0100 fix yaml commitdb9a773136Author: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 09:57:47 2025 +0100 clean up files commitc0525f41faAuthor: joshhunt <josh.hunt@grafana.com> Date: Tue Jul 1 09:44:56 2025 +0100 gha workflow commit895bea7c52Author: joshhunt <josh.hunt@grafana.com> Date: Mon Jun 30 19:33:08 2025 +0100 working dagger commitcea1f84437Author: joshhunt <josh.hunt@grafana.com> Date: Mon Jun 30 16:17:46 2025 +0100 wip * shard gha * some tidy up * add flags for exporting results, and a gha step to merge runs * fix shard gha * add dashboard-duplicate-panel test * add dashboard-outline test * add dashboards-add-panel * remove some commented out code * add dashboards-title-description test * add dashboards-remove-panel * don't install cypress * gha: check playwright results * add dashboards-edit-adhoc-variables test * fix check-jobs * add dagger cloud token * add dagger cloud token * add edit-datasource-variable test * update CODEOWNERS * add dashboards-edit-group-by-variables (skipped for now) * add dashboards-edit-panel-title-description test * add dashboards-edit-transparent-bg test * add dashboards-edit-query-variables test * run with 8 shards * add dashboards-edit-variables * tidy up gha * add dashboard-group-panels * fix action * try to cache the grafana build * fix missing action becuase no checkout, use builtin continue-on-error instead * fix missing id * cat out.txt * debug build cache * fix debug build cache * add dashboards-panel-layouts test * tidy up * no more debug * fix grafana dir * add dashboards-move-panel test * skip some failing tests * mark up plugins tests with @plugins tag, only run @plugins tests in drone * Hackathon/Playwright Conversion - Various Suite (#107516) * Playwright Migration: Various Suite tests * skipping bad tests * fix some tests that can fail * fix uid * separate user for the verify-i18n test * build test plugins for grafana server * properly blur input fields * login manually * get dashboardPage from goto * ignore a couple of type assertions * remove a couple of timeouts * remove timeouts on dashboard-share-internally * use toBeHidden * make dashboard-share-internally more stable * remove TEMP_DAGGER_TOKEN * clean up visaulization-suggestions * unskip gauge test * unskip trace-view-scrolling * attempt to make create variable utils stable * unskip loki tests * make go linter happy * unskip edit-group-by-variables test * unskip move panel tests * isolate dashboard-timepicker tests with separate user * create data source as part of smoke test * make sure we're awaiting in dashboard-edit-adhoc-variables * make dashboards-edit-variables test more robust * Hackathon Playwright: Dashboards Search (#107580) * Hackathon Playwright: Dashboards Search * Feedback changes * make trace-view-scrolling more stable * add json report and bench step * fix bench version * move fail step to after the playwright report so we can report test failures * fix output file name * fix typo * try wrap in expect.poll * stability * bit more tidy up * fix dashboard-new-layouts tests * move test-plugins to e2e-playwright * fix go code for drone e2e run * move loki plugin-e2e test * make v2 dashboards work again --------- Co-authored-by: joshhunt <josh.hunt@grafana.com> Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com> Co-authored-by: Collin Fingar <collin.fingar@grafana.com> Co-authored-by: Jeff Levin <jeff@levinology.com>
232 lines
8.2 KiB
YAML
232 lines
8.2 KiB
YAML
# This workflow creates a new PR in Grafana which is triggered after a release is completed.
|
|
# It should include all code changes that are needed after a release is done. This includes the changelog update and
|
|
# version bumps, but could include more in the future.
|
|
# Please refrain from including any processes that do not result in code changes in this workflow. Instead, they should
|
|
# either be triggered in the release promotion process or in the release comms process (that is triggered by merging
|
|
# this PR).
|
|
name: Grafana Release PR
|
|
on:
|
|
workflow_dispatch:
|
|
inputs:
|
|
previous_version:
|
|
type: string
|
|
required: false
|
|
description: 'The release version (semver, git tag, branch or commit) to use for comparison'
|
|
version:
|
|
required: true
|
|
type: string
|
|
description: The version of Grafana that is being released (without the `v` prefix)`
|
|
target:
|
|
required: false
|
|
type: string
|
|
description: 'Unused: left here for backwards compatibility'
|
|
changelog:
|
|
required: false
|
|
type: boolean
|
|
default: true
|
|
bump:
|
|
required: false
|
|
type: boolean
|
|
default: true
|
|
dry_run:
|
|
required: false
|
|
default: false
|
|
type: boolean
|
|
latest:
|
|
required: false
|
|
default: false
|
|
type: boolean
|
|
release_date:
|
|
required: false
|
|
type: string
|
|
description: "Release date in format YYYY-MM-DD"
|
|
|
|
permissions:
|
|
contents: read
|
|
|
|
jobs:
|
|
capture-date:
|
|
runs-on: ubuntu-latest
|
|
outputs:
|
|
release_date: ${{ steps.set_release_date.outputs.release_date }}
|
|
steps:
|
|
- name: compute_release_date
|
|
run: |
|
|
if [ -n "$DATE" ]; then
|
|
echo "release_date=$DATE" >> "$GITHUB_ENV"
|
|
exit 0
|
|
fi
|
|
|
|
echo "Fetching workflow run creation date..."
|
|
created_at=$(gh run view "$GITHUB_RUN_ID" --repo "$GH_REPO" --json createdAt -q .createdAt)
|
|
formatted_date=$(date -d "$created_at" +%Y-%m-%d)
|
|
echo "release_date=$formatted_date" >> "$GITHUB_ENV"
|
|
env:
|
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
GH_REPO: ${{ github.repository }}
|
|
DATE: ${{ inputs.release_date }}
|
|
|
|
- id: set_release_date
|
|
run: echo "release_date=$release_date" >> "$GITHUB_OUTPUT"
|
|
|
|
push-changelog-to-main:
|
|
needs: capture-date
|
|
permissions:
|
|
contents: write
|
|
id-token: write
|
|
pull-requests: write
|
|
|
|
name: Create PR to main to update the changelog
|
|
uses: ./.github/workflows/changelog.yml
|
|
concurrency:
|
|
group: grafana-release-pr-update-changelog-main
|
|
cancel-in-progress: false
|
|
with:
|
|
previous_version: ${{inputs.previous_version}}
|
|
version: ${{ inputs.version }}
|
|
latest: ${{ inputs.latest }}
|
|
dry_run: ${{ inputs.dry_run }}
|
|
target: main
|
|
work_branch: changelog/update-changelog-${{ needs.capture-date.outputs.release_date }}
|
|
|
|
create-prs:
|
|
permissions:
|
|
contents: write
|
|
id-token: write
|
|
pull-requests: write
|
|
name: Create Release PR
|
|
runs-on: ubuntu-latest
|
|
if: github.repository == 'grafana/grafana'
|
|
env:
|
|
VERSION: ${{ inputs.version }}
|
|
LATEST: ${{ inputs.latest }}
|
|
DRY_RUN: ${{ inputs.dry_run }}
|
|
steps:
|
|
- name: "Get vault secrets"
|
|
id: vault-secrets
|
|
uses: grafana/shared-workflows/actions/get-vault-secrets@main
|
|
with:
|
|
repo_secrets: |
|
|
GRAFANA_DELIVERY_BOT_APP_PEM=delivery-bot-app:PRIVATE_KEY
|
|
- name: Generate token
|
|
id: generate_changelog_token
|
|
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
|
|
with:
|
|
app_id: ${{ vars.DELIVERY_BOT_APP_ID }}
|
|
private_key: ${{ env.GRAFANA_DELIVERY_BOT_APP_PEM }}
|
|
repositories: "[\"grafana\", \"grafana-enterprise\"]"
|
|
permissions: "{\"contents\": \"write\", \"pull_requests\": \"write\", \"workflows\":\"write\"}"
|
|
- run: echo "RELEASE_BRANCH=release-${VERSION}" >> "$GITHUB_ENV"
|
|
- name: Checkout Grafana
|
|
uses: actions/checkout@v4
|
|
with:
|
|
token: ${{ steps.generate_changelog_token.outputs.token }}
|
|
ref: ${{ env.RELEASE_BRANCH }}
|
|
fetch-tags: true
|
|
fetch-depth: 0
|
|
- name: Checkout Grafana (main)
|
|
uses: actions/checkout@v4
|
|
with:
|
|
token: ${{ steps.generate_changelog_token.outputs.token }}
|
|
ref: main
|
|
fetch-depth: '0'
|
|
path: .grafana-main
|
|
|
|
- name: Setup nodejs environment
|
|
uses: actions/setup-node@v4
|
|
with:
|
|
node-version-file: .nvmrc
|
|
- uses: actions/setup-go@v5
|
|
with:
|
|
go-version-file: go.mod
|
|
- name: Configure git user
|
|
run: |
|
|
git config --local user.name "grafana-delivery-bot[bot]"
|
|
git config --local user.email "grafana-delivery-bot[bot]@users.noreply.github.com"
|
|
git config --local --add --bool push.autoSetupRemote true
|
|
|
|
- name: Create branch
|
|
run: git checkout -b "release/${{ github.run_number }}/$VERSION"
|
|
- name: Generate changelog
|
|
id: changelog
|
|
if: ${{ inputs.changelog == true || inputs.changelog == 'true' }}
|
|
uses: ./.grafana-main/.github/actions/changelog
|
|
with:
|
|
previous: ${{inputs.previous_version}}
|
|
github_token: ${{ steps.generate_changelog_token.outputs.token }}
|
|
target: v${{ env.VERSION }}
|
|
output_file: changelog_items.md
|
|
- name: Patch CHANGELOG.md
|
|
if: ${{ inputs.changelog == true || inputs.changelog == 'true' }}
|
|
run: |
|
|
# Prepare CHANGELOG.md content with version delimiters
|
|
(
|
|
echo
|
|
echo "# $VERSION ($(date '+%F'))"
|
|
echo
|
|
cat changelog_items.md
|
|
) > CHANGELOG.part
|
|
|
|
# Check if a version exists in the changelog
|
|
if grep -q "<!-- $VERSION START" CHANGELOG.md ; then
|
|
# Replace the content between START and END delimiters
|
|
echo "Version $VERSION is found in the CHANGELOG.md, patching contents..."
|
|
sed -i -e "/$VERSION START/,/$VERSION END/{//!d;}" \
|
|
-e "/$VERSION START/r CHANGELOG.part" CHANGELOG.md
|
|
else
|
|
# Prepend changelog part to the main changelog file
|
|
echo "Version $VERSION not found in the CHANGELOG.md"
|
|
(
|
|
echo "<!-- $VERSION START -->"
|
|
cat CHANGELOG.part
|
|
echo "<!-- $VERSION END -->"
|
|
cat CHANGELOG.md
|
|
) > CHANGELOG.tmp
|
|
mv CHANGELOG.tmp CHANGELOG.md
|
|
fi
|
|
|
|
rm -f CHANGELOG.part changelog_items.md
|
|
|
|
git diff CHANGELOG.md
|
|
- name: "Prettify CHANGELOG.md"
|
|
if: ${{ inputs.changelog == true || inputs.changelog == 'true' }}
|
|
run: npx prettier --write CHANGELOG.md
|
|
- name: Commit CHANGELOG.md changes
|
|
if: ${{ inputs.changelog == true || inputs.changelog == 'true' }}
|
|
run: git add CHANGELOG.md && git commit --allow-empty -m "Update changelog" CHANGELOG.md
|
|
- name: Bump versions
|
|
if: ${{ inputs.bump == true || inputs.bump == 'true' }}
|
|
uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
|
|
with:
|
|
verb: run
|
|
args: go run -C .grafana-main ./pkg/build/actions/bump-version -version="patch"
|
|
|
|
- name: make gen-cue
|
|
shell: bash
|
|
run: make gen-cue
|
|
- name: Add package.json changes
|
|
if: ${{ inputs.bump == true || inputs.bump == 'true' }}
|
|
run: |
|
|
git add package.json lerna.json yarn.lock packages public
|
|
test -e e2e-playwright/test-plugins && git add e2e-playwright/test-plugins
|
|
git commit -m "Update version to $VERSION"
|
|
|
|
- name: Git push
|
|
run: git push
|
|
- name: Create PR
|
|
env:
|
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
DRY_RUN: ${{ inputs.dry_run }}
|
|
run: |
|
|
LATEST_FLAG=()
|
|
if [ "$LATEST" = "true" ]; then
|
|
LATEST_FLAG=(-l "release/latest")
|
|
fi
|
|
gh pr create \
|
|
"${LATEST_FLAG[@]}" \
|
|
-l "no-changelog" \
|
|
--dry-run="$DRY_RUN" \
|
|
-B "${RELEASE_BRANCH}" \
|
|
--title "Release: $VERSION" \
|
|
--body "These code changes must be merged after a release is complete"
|