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

chore: [release-2.9.x] Bump go to 1.21.9 and build image to 0.33.1 #12488

Merged
merged 9 commits into from
Apr 6, 2024
Merged

chore: [release-2.9.x] Bump go to 1.21.9 and build image to 0.33.1 #12488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ce1eb8
Try 0.33 again
MichelHollands Apr 5, 2024
a06acd4
Fix build image version
MichelHollands Apr 5, 2024
833e773
Fix build image version again
MichelHollands Apr 5, 2024
0a91f5b
Update Go version
MichelHollands Apr 5, 2024
f214b8d
Use 0.30.1 in check stage
MichelHollands Apr 5, 2024
fbc405b
Update .golangci.yml
MichelHollands Apr 5, 2024
a6425d6
Apply linter suggestions
MichelHollands Apr 5, 2024
acabc56
Use 0.33.1 image in check stage
MichelHollands Apr 5, 2024
d4aed94
Use golangci-lint 1.55.1 in the Github Actions
MichelHollands Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "grafana/loki-build-image:0.29.0",
"image": "grafana/loki-build-image:0.33.1",
"containerEnv": {
"BUILD_IN_CONTAINER": "false"
},
Expand Down
2 changes: 1 addition & 1 deletion .drone/drone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {

[
pipeline('loki-build-image') {
local build_image_tag = '0.33.1-golangci.1.51.2',
local build_image_tag = '0.33.1',
MichelHollands marked this conversation as resolved.
Show resolved Hide resolved
workspace: {
base: '/src',
path: 'loki',
Expand Down
46 changes: 23 additions & 23 deletions .drone/drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:
dry_run: true
repo: grafana/loki-build-image
tags:
- 0.33.1-golangci.1.51.2
- 0.33.1
when:
event:
- pull_request
Expand All @@ -26,7 +26,7 @@ steps:
from_secret: docker_password
repo: grafana/loki-build-image
tags:
- 0.33.1-golangci.1.51.2
- 0.33.1
username:
from_secret: docker_username
when:
Expand Down Expand Up @@ -93,14 +93,14 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: check-drone-drift
- commands:
- make BUILD_IN_CONTAINER=false check-generated-files
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: check-generated-files
- commands:
- cd ..
Expand All @@ -110,7 +110,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: clone-target-branch
when:
event:
Expand All @@ -121,14 +121,14 @@ steps:
- clone-target-branch
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: test
- commands:
- cd ../loki-target-branch && BUILD_IN_CONTAINER=false make test
depends_on:
- clone-target-branch
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: test-target-branch
when:
event:
Expand All @@ -141,7 +141,7 @@ steps:
- test
- test-target-branch
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: compare-coverage
when:
event:
Expand All @@ -159,7 +159,7 @@ steps:
TOKEN:
from_secret: github_token
USER: grafanabot
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: report-coverage
when:
event:
Expand All @@ -169,15 +169,15 @@ steps:
depends_on:
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: lint
- commands:
- make BUILD_IN_CONTAINER=false check-mod
depends_on:
- test
- lint
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: check-mod
- commands:
- apk add make bash && make lint-scripts
Expand All @@ -188,21 +188,21 @@ steps:
depends_on:
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: loki
- commands:
- make BUILD_IN_CONTAINER=false check-doc
depends_on:
- loki
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: check-doc
- commands:
- make BUILD_IN_CONTAINER=false check-format GIT_TARGET_BRANCH="$DRONE_TARGET_BRANCH"
depends_on:
- loki
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: check-format
when:
event:
Expand All @@ -212,14 +212,14 @@ steps:
depends_on:
- loki
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: validate-example-configs
- commands:
- make BUILD_IN_CONTAINER=false check-example-config-doc
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: check-example-config-doc
- commands:
- mkdir -p /hugo/content/docs/loki/latest
Expand Down Expand Up @@ -252,7 +252,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: loki-mixin-check
when:
event:
Expand All @@ -277,7 +277,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: documentation-helm-reference-check
trigger:
ref:
Expand Down Expand Up @@ -1683,15 +1683,15 @@ steps:
NFPM_SIGNING_KEY:
from_secret: gpg_private_key
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: write-key
- commands:
- make BUILD_IN_CONTAINER=false packages
environment:
NFPM_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: test packaging
- commands:
- ./tools/packaging/verify-deb-install.sh
Expand All @@ -1717,7 +1717,7 @@ steps:
NFPM_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: publish
when:
event:
Expand Down Expand Up @@ -1752,7 +1752,7 @@ steps:
from_secret: docker_password
DOCKER_USERNAME:
from_secret: docker_username
image: grafana/loki-build-image:0.30.1
image: grafana/loki-build-image:0.33.1
name: build and push
privileged: true
volumes:
Expand Down Expand Up @@ -2017,6 +2017,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 016d84867476782105e34f5165893b0fbb62e393be4cf5436c199f6e339d79d7
hmac: d8b8157778d7af50fed6a3495772371184d2df57c6940516be68ecdf8cdf5de4

...
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"check":
"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"
"build_image": "grafana/loki-build-image:0.33.1"
"golang_ci_lint_version": "v1.55.1"
"release_lib_ref": "loki-2.9.x"
"skip_validation": false
"use_github_app_token": true
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/minor-release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
check:
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"
build_image: "grafana/loki-build-image:0.33.1"
golang_ci_lint_version: "v1.55.1"
release_lib_ref: "loki-2.9.x"
skip_validation: false
use_github_app_token: true
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
--target-branch "${{ steps.extract_branch.outputs.branch }}" \
--token "${{ steps.github_app_token.outputs.token }}" \
--versioning-strategy "${{ env.VERSIONING_STRATEGY }}"

working-directory: "lib"
dist:
needs:
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
--env SKIP_ARM \
--volume .:/src/loki \
--workdir /src/loki \
--entrypoint /bin/sh "grafana/loki-build-image:0.30.1"
--entrypoint /bin/sh "grafana/loki-build-image:0.33.1"
git config --global --add safe.directory /src/loki
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
make dist packages
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -369,7 +369,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -431,7 +431,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -495,7 +495,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -559,7 +559,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -623,7 +623,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -687,7 +687,7 @@ jobs:
name: "parse image platform"
run: |
mkdir -p images

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -778,16 +778,16 @@ jobs:
--target-branch "${{ steps.extract_branch.outputs.branch }}" \
--token "${{ steps.github_app_token.outputs.token }}" \
--versioning-strategy "${{ env.VERSIONING_STRATEGY }}"

cat release.json
if [[ `jq length release.json` -gt 1 ]]; then

if [[ `jq length release.json` -gt 1 ]]; then
echo 'release-please would create more than 1 PR, so cannot determine correct version'
echo "pr_created=false" >> $GITHUB_OUTPUT
exit 1
fi
if [[ `jq length release.json` -eq 0 ]]; then

if [[ `jq length release.json` -eq 0 ]]; then
echo "pr_created=false" >> $GITHUB_OUTPUT
else
version="$(npm run --silent get-version)"
Expand Down
Loading
Loading