Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into kafka-usage-wip
Browse files Browse the repository at this point in the history
  • Loading branch information
cyriltovena committed Dec 19, 2024
2 parents 5bcf82d + 04994ca commit 13161da
Show file tree
Hide file tree
Showing 2,290 changed files with 425,405 additions and 61,123 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": "21f1189544e3976070cbdb6463f64c7a32dcc176"
"version": "cfa24256090828f566f1ba59292ce65d8db4a4ae"
}
],
"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": "21f1189544e3976070cbdb6463f64c7a32dcc176",
"sum": "IPS1oGR8k7jk6J2snciTycWFgtISCwXSPhJ3A+nEGvY="
"version": "cfa24256090828f566f1ba59292ce65d8db4a4ae",
"sum": "tml1dcFlo15kEE6JvN/nPY2xkhfeF3ERZjAyFbnguHA="
}
],
"legacyImports": false
Expand Down
19 changes: 9 additions & 10 deletions .github/release-workflows.jsonnet
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;

local build = lokiRelease.build;
local releaseLibRef = 'main';

local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;
local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
local golangCiLintVersion = 'v1.60.3';
local imageBuildTimeoutMin = 60;
local imagePrefix = 'grafana';
local dockerPluginDir = 'clients/cmd/docker-driver';

local imageJobs = {
loki: build.image('loki', 'cmd/loki'),
Expand All @@ -15,7 +20,7 @@ local imageJobs = {
'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
promtail: build.image('promtail', 'clients/cmd/promtail'),
querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
'loki-docker-driver': build.dockerPlugin('grafana/loki-docker-driver', 'clients/cmd/docker-driver', platform=['linux/amd64', 'linux/arm64']),
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage, platform=['linux/amd64', 'linux/arm64']),
};

local weeklyImageJobs = {
Expand All @@ -25,13 +30,6 @@ local weeklyImageJobs = {
promtail: build.weeklyImage('promtail', 'clients/cmd/promtail'),
};

local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
local golangCiLintVersion = 'v1.60.3';

local imageBuildTimeoutMin = 60;
local imagePrefix = 'grafana';

{
'patch-release-pr.yml': std.manifestYamlDoc(
lokiRelease.releasePRWorkflow(
Expand Down Expand Up @@ -77,6 +75,7 @@ local imagePrefix = 'grafana';
getDockerCredsFromVault=true,
imagePrefix='grafana',
releaseLibRef=releaseLibRef,
pluginBuildDir=dockerPluginDir,
releaseRepo='grafana/loki',
useGitHubAppToken=true,
), false, false
Expand Down
104 changes: 18 additions & 86 deletions .github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet

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.

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

2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
"with":
"build_image": "grafana/loki-build-image:0.34.1"
"build_image": "grafana/loki-build-image:0.34.3"
"golang_ci_lint_version": "v1.60.3"
"release_lib_ref": "main"
"skip_validation": false
Expand Down
Loading

0 comments on commit 13161da

Please sign in to comment.