From 5589e67f7236c65f32340a10b5dfce93096ac2dd Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Wed, 27 Mar 2024 11:08:53 -0600 Subject: [PATCH] ci: try default versioning strategy --- .github/release-workflows.jsonnet | 2 +- .github/workflows/major-release-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet index 89c43cdd98d1d..97f3d269ca8bf 100644 --- a/.github/release-workflows.jsonnet +++ b/.github/release-workflows.jsonnet @@ -79,7 +79,7 @@ local imagePrefix = 'grafana'; skipArm=true, skipValidation=true, useGitHubAppToken=true, - versioningStrategy='always-bump-major', + versioningStrategy='default', ) + { name: 'Prepare Major Release PR from main', }, false, false diff --git a/.github/workflows/major-release-pr.yml b/.github/workflows/major-release-pr.yml index 9ab96962abe8d..f792f9d9811f7 100644 --- a/.github/workflows/major-release-pr.yml +++ b/.github/workflows/major-release-pr.yml @@ -11,7 +11,7 @@ env: RELEASE_REPO: "grafana/loki" SKIP_VALIDATION: true USE_GITHUB_APP_TOKEN: true - VERSIONING_STRATEGY: "always-bump-major" + VERSIONING_STRATEGY: "default" jobs: check: uses: "grafana/loki-release/.github/workflows/check.yml@main"