Skip to content

Commit b06b508

Browse files
trevorwhitneytrevorwhitney
authored
fix: bump go version for 3.6.x (#20667)
1 parent 9d5fb5f commit b06b508

8 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎.github/jsonnetfile.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "workflows"
99
}
1010
},
11-
"version": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
11+
"version": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
1212
}
1313
],
1414
"legacyImports": true

‎.github/jsonnetfile.lock.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "workflows"
99
}
1010
},
11-
"version": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f",
11+
"version": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc",
1212
"sum": "LfNl0q+23sWMu/zwsqHfbUuEfYZMNN2xpZBRizUUHHY="
1313
}
1414
],

‎.github/workflows/check.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"jobs":
22
"check":
3-
"uses": "grafana/loki-release/.github/workflows/check.yml@dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
3+
"uses": "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.8"
5+
"build_image": "grafana/loki-build-image:0.34.9"
66
"golang_ci_lint_version": "v2.5.0"
7-
"release_lib_ref": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
7+
"release_lib_ref": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
88
"skip_validation": false
99
"use_github_app_token": true
1010
"name": "check"
@@ -15,4 +15,4 @@
1515
- "main"
1616
"permissions":
1717
"contents": "read"
18-
"pull-requests": "read"
18+
"pull-requests": "read"

‎.github/workflows/images.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
"jobs":
22
"check":
3-
"uses": "grafana/loki-release/.github/workflows/check.yml@dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
3+
"uses": "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.8"
5+
"build_image": "grafana/loki-build-image:0.34.9"
66
"golang_ci_lint_version": "v2.5.0"
7-
"release_lib_ref": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
7+
"release_lib_ref": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
88
"skip_validation": false
99
"use_github_app_token": true
1010
"loki-canary-boringcrypto-image":
1111
"env":
1212
"BUILD_TIMEOUT": 60
1313
"GO_VERSION": "1.25"
1414
"IMAGE_PREFIX": "grafana"
15-
"RELEASE_LIB_REF": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
15+
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
1616
"RELEASE_REPO": "grafana/loki"
1717
"needs":
1818
- "check"
@@ -136,7 +136,7 @@
136136
"BUILD_TIMEOUT": 60
137137
"GO_VERSION": "1.25"
138138
"IMAGE_PREFIX": "grafana"
139-
"RELEASE_LIB_REF": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
139+
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
140140
"RELEASE_REPO": "grafana/loki"
141141
"needs":
142142
- "check"
@@ -260,7 +260,7 @@
260260
"BUILD_TIMEOUT": 60
261261
"GO_VERSION": "1.25"
262262
"IMAGE_PREFIX": "grafana"
263-
"RELEASE_LIB_REF": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
263+
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
264264
"RELEASE_REPO": "grafana/loki"
265265
"needs":
266266
- "check"
@@ -384,7 +384,7 @@
384384
"BUILD_TIMEOUT": 60
385385
"GO_VERSION": "1.25"
386386
"IMAGE_PREFIX": "grafana"
387-
"RELEASE_LIB_REF": "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
387+
"RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
388388
"RELEASE_REPO": "grafana/loki"
389389
"needs":
390390
- "check"
@@ -512,4 +512,4 @@
512512
"workflow_dispatch": {}
513513
"permissions":
514514
"contents": "read"
515-
"pull-requests": "read"
515+
"pull-requests": "read"

‎.github/workflows/minor-release-pr.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
DRY_RUN: false
99
GITHUB_APP: "loki-gh-app"
1010
IMAGE_PREFIX: "grafana"
11-
RELEASE_LIB_REF: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
11+
RELEASE_LIB_REF: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
1212
RELEASE_REPO: "grafana/loki"
1313
SKIP_VALIDATION: false
1414
USE_GITHUB_APP_TOKEN: true
@@ -19,11 +19,11 @@ jobs:
1919
contents: "write"
2020
id-token: "write"
2121
pull-requests: "write"
22-
uses: "grafana/loki-release/.github/workflows/check.yml@dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
22+
uses: "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
2323
with:
24-
build_image: "grafana/loki-build-image:0.34.8"
24+
build_image: "grafana/loki-build-image:0.34.9"
2525
golang_ci_lint_version: "v2.5.0"
26-
release_lib_ref: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
26+
release_lib_ref: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
2727
skip_validation: false
2828
use_github_app_token: true
2929
create-release-pr:
@@ -179,10 +179,10 @@ jobs:
179179
--env SKIP_ARM \
180180
--volume .:/src/loki \
181181
--workdir /src/loki \
182-
--entrypoint /bin/sh "grafana/loki-build-image:0.34.8"
182+
--entrypoint /bin/sh "grafana/loki-build-image:0.34.9"
183183
git config --global --add safe.directory /src/loki
184184
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
185-
if echo "grafana/loki-build-image:0.34.8" | grep -q "golang"; then
185+
if echo "grafana/loki-build-image:0.34.9" | grep -q "golang"; then
186186
/src/loki/.github/vendor/github.com/grafana/loki-release/workflows/install_workflow_dependencies.sh dist
187187
fi
188188
make dist packages
@@ -798,7 +798,7 @@ jobs:
798798
build-args: |
799799
IMAGE_TAG=${{ needs.version.outputs.version }}
800800
GOARCH=${{ steps.platform.outputs.platform_short }}
801-
BUILD_IMAGE=grafana/loki-build-image:0.34.8
801+
BUILD_IMAGE=grafana/loki-build-image:0.34.9
802802
context: "release"
803803
file: "release/clients/cmd/docker-driver/Dockerfile"
804804
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"
@@ -1111,4 +1111,4 @@ name: "Prepare Minor Release PR from Weekly"
11111111
- "k[0-9]+"
11121112
permissions:
11131113
contents: "read"
1114-
pull-requests: "read"
1114+
pull-requests: "read"

‎.github/workflows/patch-release-pr.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
DRY_RUN: false
99
GITHUB_APP: "loki-gh-app"
1010
IMAGE_PREFIX: "grafana"
11-
RELEASE_LIB_REF: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
11+
RELEASE_LIB_REF: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
1212
RELEASE_REPO: "grafana/loki"
1313
SKIP_VALIDATION: false
1414
USE_GITHUB_APP_TOKEN: true
@@ -19,11 +19,11 @@ jobs:
1919
contents: "write"
2020
id-token: "write"
2121
pull-requests: "write"
22-
uses: "grafana/loki-release/.github/workflows/check.yml@dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
22+
uses: "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
2323
with:
24-
build_image: "grafana/loki-build-image:0.34.8"
24+
build_image: "grafana/loki-build-image:0.34.9"
2525
golang_ci_lint_version: "v2.5.0"
26-
release_lib_ref: "dfe753760ce6ec2f4549fc11d2df24a2aa584e3f"
26+
release_lib_ref: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
2727
skip_validation: false
2828
use_github_app_token: true
2929
create-release-pr:
@@ -179,10 +179,10 @@ jobs:
179179
--env SKIP_ARM \
180180
--volume .:/src/loki \
181181
--workdir /src/loki \
182-
--entrypoint /bin/sh "grafana/loki-build-image:0.34.8"
182+
--entrypoint /bin/sh "grafana/loki-build-image:0.34.9"
183183
git config --global --add safe.directory /src/loki
184184
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
185-
if echo "grafana/loki-build-image:0.34.8" | grep -q "golang"; then
185+
if echo "grafana/loki-build-image:0.34.9" | grep -q "golang"; then
186186
/src/loki/.github/vendor/github.com/grafana/loki-release/workflows/install_workflow_dependencies.sh dist
187187
fi
188188
make dist packages
@@ -798,7 +798,7 @@ jobs:
798798
build-args: |
799799
IMAGE_TAG=${{ needs.version.outputs.version }}
800800
GOARCH=${{ steps.platform.outputs.platform_short }}
801-
BUILD_IMAGE=grafana/loki-build-image:0.34.8
801+
BUILD_IMAGE=grafana/loki-build-image:0.34.9
802802
context: "release"
803803
file: "release/clients/cmd/docker-driver/Dockerfile"
804804
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"
@@ -1111,4 +1111,4 @@ name: "Prepare Patch Release PR"
11111111
- "release-[0-9]+.[0-9]+.x"
11121112
permissions:
11131113
contents: "read"
1114-
pull-requests: "read"
1114+
pull-requests: "read"