Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: image tag from env and pin release to v1.11.5 #12073

Merged
merged 2 commits into from Feb 27, 2024
Merged

fix: image tag from env and pin release to v1.11.5 #12073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a343538
fix: image tag from env and pin release to v1.11.5
trevorwhitney Feb 27, 2024
368522a
Merge branch 'release-2.8.x' into last-few-fixes
trevorwhitney Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "release-1.11.x"
"version": "v1.11.5"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "e5f369532d30a4f83e3abdd1f58bd52a4871a419",
"sum": "n2lxvnkcGKkH7iTFRRBzjPGZGOaMNZvFhdr2abEqhs0="
"version": "09374df9ca39fa58ec93d9e3fad4da1593186039",
"sum": "eMlN1tvu1jxKTdWvNfmXESn7JI+Wfu2C1wCabo7P2VQ="
}
],
"legacyImports": false
Expand Down
6 changes: 5 additions & 1 deletion .github/release-workflows.jsonnet
View file
Open in desktop
@@ -1,7 +1,11 @@
local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;

local releaseLibRef = 'release-1.11.x';
local releaseLibRef = std.filter(
function(dep) dep.source.git.remote == 'https://github.com/grafana/loki-release.git',
(import 'jsonnetfile.json').dependencies
)[0].version;

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

local imageJobs = {
Expand Down
6 changes: 5 additions & 1 deletion .github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions .github/workflows/minor-release-pr.yml
View file
Open in desktop
Expand Up @@ -3,18 +3,18 @@ concurrency:
env:
DOCKER_USERNAME: "grafana"
IMAGE_PREFIX: "grafana"
RELEASE_LIB_REF: "release-1.11.x"
RELEASE_LIB_REF: "v1.11.5"
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.11.x"
uses: "grafana/loki-release/.github/workflows/check.yml@v1.11.5"
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.5"
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
View file
Open in desktop
Expand Up @@ -3,18 +3,18 @@ concurrency:
env:
DOCKER_USERNAME: "grafana"
IMAGE_PREFIX: "grafana"
RELEASE_LIB_REF: "release-1.11.x"
RELEASE_LIB_REF: "v1.11.5"
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.11.x"
uses: "grafana/loki-release/.github/workflows/check.yml@v1.11.5"
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.5"
skip_validation: false
use_github_app_token: true
create-release-pr:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
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.5"
RELEASE_REPO: "grafana/loki"
USE_GITHUB_APP_TOKEN: false
jobs:
Expand Down Expand Up @@ -201,4 +201,7 @@ name: "create release"
branches:
- "release-[0-9]+.[0-9]+.x"
- "k[0-9]+"
permissions: "write-all"
permissions:
contents: "write"
id-token: "write"
pull-requests: "write"
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ BUILD_IMAGE_VERSION := 0.29.3-go1.20.10
# Docker image info
IMAGE_PREFIX ?= grafana

IMAGE_TAG := $(shell ./tools/image-tag)
IMAGE_TAG ?= $(shell ./tools/image-tag)

# Version info for binaries
GIT_REVISION := $(shell git rev-parse --short HEAD)
Expand Down