Skip to content

Commit

Permalink
ci: pin release code to v1.11.0 (#12046)
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorwhitney authored Feb 23, 2024
1 parent 9db9a3e commit 50a5844
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "release-1.11.x"
"version": "v1.11.0"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "c723914ae86f6c4f9bc294294b076bc39ed43dab",
"sum": "koN50RMgvaxWZ77YKvs21G/Tt4NgsnL36CY4tTVhAUE="
"version": "2fdeeb8b15cd8feab4e2c06a0af735df772d31ad",
"sum": "VbCmY3Z2t3EA7whoQXaS5Gn2F0p9+dHJlgH/d6d2jf0="
}
],
"legacyImports": false
Expand Down
13 changes: 8 additions & 5 deletions .github/release-workflows.jsonnet
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;

local checkTemplate = 'grafana/loki-release/.github/workflows/[email protected]';
local releaseLibRef = 'v1.11.0';
{
'patch-release-pr.yml': std.manifestYamlDoc(
lokiRelease.releasePRWorkflow(
Expand All @@ -16,10 +19,10 @@ local build = lokiRelease.build;
},
buildImage='grafana/loki-build-image:0.29.3-go1.20.10',
branches=['release-[0-9]+.[0-9]+.x'],
checkTemplate='grafana/loki-release/.github/workflows/[email protected]',
checkTemplate=checkTemplate,
golangCiLintVersion='v1.51.2',
imagePrefix='grafana',
releaseLibRef='release-1.11.x',
releaseLibRef=releaseLibRef,
releaseRepo='grafana/loki',
skipArm=false,
skipValidation=false,
Expand All @@ -41,10 +44,10 @@ local build = lokiRelease.build;
},
buildImage='grafana/loki-build-image:0.29.3-go1.20.10',
branches=['k[0-9]+'],
checkTemplate='grafana/loki-release/.github/workflows/[email protected]',
checkTemplate=checkTemplate,
golangCiLintVersion='v1.51.2',
imagePrefix='grafana',
releaseLibRef='release-1.11.x',
releaseLibRef=releaseLibRef,
releaseRepo='grafana/loki',
skipArm=false,
skipValidation=false,
Expand All @@ -56,7 +59,7 @@ local build = lokiRelease.build;
branches=['release-[0-9]+.[0-9]+.x', 'k[0-9]+'],
getDockerCredsFromVault=true,
imagePrefix='grafana',
releaseLibRef='release-1.11.x',
releaseLibRef=releaseLibRef,
releaseRepo='grafana/loki',
), false, false
),
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions .github/workflows/minor-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ concurrency:
env:
DOCKER_USERNAME: "grafana"
IMAGE_PREFIX: "grafana"
RELEASE_LIB_REF: "release-1.11.x"
RELEASE_LIB_REF: "v1.11.0"
RELEASE_REPO: "grafana/loki"
SKIP_VALIDATION: false
VERSIONING_STRATEGY: "always-bump-minor"
jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@release-1.11.x"
uses: "grafana/loki-release/.github/workflows/check.yml@v1.11.0"
with:
build_image: "grafana/loki-build-image:0.29.3-go1.20.10"
golang_ci_lint_version: "v1.51.2"
release_lib_ref: "release-1.11.x"
release_lib_ref: "v1.11.0"
skip_validation: false
create-release-pr:
needs:
Expand Down Expand Up @@ -59,14 +59,14 @@ jobs:
--consider-all-branches \
--label "backport main,autorelease: pending,type/docs" \
--pull-request-footer "Merging this PR will release the [artifacts](https://console.cloud.google.com/storage/browser/loki-build-artifacts/${SHA}) of ${SHA}" \
--group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
--release-type simple \
--repo-url "${{ env.RELEASE_REPO }}" \
--target-branch "${{ steps.extract_branch.outputs.branch }}" \
--token "${{ secrets.GH_TOKEN }}" \
--versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \
--separate-pull-requests false \
--manifest-file .release-please-manifest.json \
--debug
--manifest-file .release-please-manifest.json
working-directory: "lib"
dist:
needs:
Expand Down Expand Up @@ -697,13 +697,16 @@ jobs:
--consider-all-branches \
--dry-run \
--dry-run-output release.json \
--group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
--release-type simple \
--repo-url="${{ env.RELEASE_REPO }}" \
--separate-pull-requests false \
--target-branch "${{ steps.extract_branch.outputs.branch }}" \
--token="${{ secrets.GH_TOKEN }}" \
--versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \
--manifest-file .release-please-manifest.json \
--debug
--manifest-file .release-please-manifest.json
cat release.json
if [[ `jq length release.json` -gt 1 ]]; then
echo 'release-please would create more than 1 PR, so cannot determine correct version'
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/patch-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ concurrency:
env:
DOCKER_USERNAME: "grafana"
IMAGE_PREFIX: "grafana"
RELEASE_LIB_REF: "release-1.11.x"
RELEASE_LIB_REF: "v1.11.0"
RELEASE_REPO: "grafana/loki"
SKIP_VALIDATION: false
VERSIONING_STRATEGY: "always-bump-patch"
jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@release-1.11.x"
uses: "grafana/loki-release/.github/workflows/check.yml@v1.11.0"
with:
build_image: "grafana/loki-build-image:0.29.3-go1.20.10"
golang_ci_lint_version: "v1.51.2"
release_lib_ref: "release-1.11.x"
release_lib_ref: "v1.11.0"
skip_validation: false
create-release-pr:
needs:
Expand Down Expand Up @@ -59,14 +59,14 @@ jobs:
--consider-all-branches \
--label "backport main,autorelease: pending,type/docs" \
--pull-request-footer "Merging this PR will release the [artifacts](https://console.cloud.google.com/storage/browser/loki-build-artifacts/${SHA}) of ${SHA}" \
--group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
--release-type simple \
--repo-url "${{ env.RELEASE_REPO }}" \
--target-branch "${{ steps.extract_branch.outputs.branch }}" \
--token "${{ secrets.GH_TOKEN }}" \
--versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \
--separate-pull-requests false \
--manifest-file .release-please-manifest.json \
--debug
--manifest-file .release-please-manifest.json
working-directory: "lib"
dist:
needs:
Expand Down Expand Up @@ -697,13 +697,16 @@ jobs:
--consider-all-branches \
--dry-run \
--dry-run-output release.json \
--group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
--release-type simple \
--repo-url="${{ env.RELEASE_REPO }}" \
--separate-pull-requests false \
--target-branch "${{ steps.extract_branch.outputs.branch }}" \
--token="${{ secrets.GH_TOKEN }}" \
--versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \
--manifest-file .release-please-manifest.json \
--debug
--manifest-file .release-please-manifest.json
cat release.json
if [[ `jq length release.json` -gt 1 ]]; then
echo 'release-please would create more than 1 PR, so cannot determine correct version'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ concurrency:
group: "create-release-${{ github.sha }}"
env:
IMAGE_PREFIX: "grafana"
RELEASE_LIB_REF: "release-1.11.x"
RELEASE_LIB_REF: "v1.11.0"
RELEASE_REPO: "grafana/loki"
jobs:
createRelease:
Expand Down

0 comments on commit 50a5844

Please sign in to comment.