Skip to content

Commit

Permalink
ci: back to using tag
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorwhitney committed Jul 1, 2024
1 parent 06e2325 commit 31470b2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/release-workflows.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;
local job = lokiRelease.job;

local releaseLibRef = "release-1.12.x";
local releaseLibRef = 'loki-2.9.x';
local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;

local imageJobs = {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"jobs":
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@release-1.12.x"
"uses": "grafana/loki-release/.github/workflows/check.yml@loki-2.9.x"
"with":
"build_image": "grafana/loki-build-image:0.30.1"
"golang_ci_lint_version": "v1.51.2"
"release_lib_ref": "release-1.12.x"
"release_lib_ref": "loki-2.9.x"
"skip_validation": false
"use_github_app_token": true
"name": "check"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/minor-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ env:
CHANGELOG_PATH: "CHANGELOG.md"
DOCKER_USERNAME: "grafana"
IMAGE_PREFIX: "grafana"
RELEASE_LIB_REF: "release-1.12.x"
RELEASE_LIB_REF: "loki-2.9.x"
RELEASE_REPO: "grafana/loki"
SKIP_VALIDATION: false
USE_GITHUB_APP_TOKEN: true
VERSIONING_STRATEGY: "always-bump-minor"
jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@release-1.12.x"
uses: "grafana/loki-release/.github/workflows/check.yml@loki-2.9.x"
with:
build_image: "grafana/loki-build-image:0.30.1"
golang_ci_lint_version: "v1.51.2"
release_lib_ref: "release-1.12.x"
release_lib_ref: "loki-2.9.x"
skip_validation: false
use_github_app_token: true
create-release-pr:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/patch-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ env:
CHANGELOG_PATH: "CHANGELOG.md"
DOCKER_USERNAME: "grafana"
IMAGE_PREFIX: "grafana"
RELEASE_LIB_REF: "release-1.12.x"
RELEASE_LIB_REF: "loki-2.9.x"
RELEASE_REPO: "grafana/loki"
SKIP_VALIDATION: false
USE_GITHUB_APP_TOKEN: true
VERSIONING_STRATEGY: "always-bump-patch"
jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@release-1.12.x"
uses: "grafana/loki-release/.github/workflows/check.yml@loki-2.9.x"
with:
build_image: "grafana/loki-build-image:0.30.1"
golang_ci_lint_version: "v1.51.2"
release_lib_ref: "release-1.12.x"
release_lib_ref: "loki-2.9.x"
skip_validation: false
use_github_app_token: true
create-release-pr:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ concurrency:
env:
IMAGE_PREFIX: "grafana"
PUBLISH_TO_GCS: false
RELEASE_LIB_REF: "release-1.12.x"
RELEASE_LIB_REF: "loki-2.9.x"
RELEASE_REPO: "grafana/loki"
USE_GITHUB_APP_TOKEN: false
jobs:
Expand Down

0 comments on commit 31470b2

Please sign in to comment.