Skip to content

Commit 0c0674c

Browse files
committed
build: update tools
1 parent 1e84e0c commit 0c0674c

File tree

11 files changed

+29
-27
lines changed

11 files changed

+29
-27
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "Go",
3-
"image": "golang:1.24.0",
3+
"image": "golang:1.24.1",
44
"features": {
55
"ghcr.io/devcontainers/features/common-utils:2": {"username": "golang"},
66
"ghcr.io/devcontainers/features/git:1": {"version": "latest","ppa": "false"},
7-
"ghcr.io/devcontainers/features/go:1": {"version": "none", "golangciLintVersion": "1.64.4"}
7+
"ghcr.io/devcontainers/features/go:1": {"version": "none", "golangciLintVersion": "1.64.8"}
88
},
99
"runArgs": [
1010
"--security-opt",

.github/workflows/ci.yaml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ on:
1414
- examples/**
1515

1616
env:
17-
GORELEASER_VERSION: v2.7.0
17+
GORELEASER_VERSION: v2.8.1
18+
GOLANGCI_LINT_VERSION: v1.64.8
1819
jobs:
1920
lint:
2021
name: Lint Code
@@ -29,20 +30,10 @@ jobs:
2930
with:
3031
go-version-file: go.mod
3132
cache: false
32-
- name: Set golangci-lint Cache Key
33-
id: create-sha
34-
run: |
35-
echo "GOLANGCILINT_SHA=$(cat ./tools/GOLANGCI_LINT_VERSION | sha256sum - | awk '{ print $1 }')" >> $GITHUB_ENV
36-
- name: Setup golangci-lint Cache
37-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
38-
with:
39-
path: |
40-
./tools/bin
41-
key: ${{ runner.os }}-go-${{ env.GOLANGCILINT_SHA }}
42-
restore-keys: |
43-
${{ runner.os }}-go-${{ env.GOLANGCILINT_SHA }}
44-
- name: Run Lint CI
45-
run: make ci-lint GOLANGCI_LINT_MODE="github-actions"
33+
- name: golangci-lint
34+
uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea # v6.5.1
35+
with:
36+
version: ${{ env.GOLANGCI_LINT_VERSION }}
4637

4738
test:
4839
name: Testing on ${{ matrix.os }}

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.0
1+
1.24.1

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
name: Trims trailing whitespace
3131
args: [--markdown-linebreak-ext=md] # add exception for markdown linebreaks
3232
- repo: https://github.com/gitleaks/gitleaks
33-
rev: v8.23.3
33+
rev: v8.24.0
3434
hooks:
3535
- id: gitleaks
3636
name: Protect and discover secrets using Gitleaks
File renamed without changes.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/mia-platform/vab
22

3-
go 1.24.0
3+
go 1.24.1
44

55
require (
66
github.com/MakeNowJust/heredoc/v2 v2.0.1

tools/DEEPCOPY_GEN_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.32.1
1+
v0.32.3

tools/GOLANGCI_LINT_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.64.4
1+
v1.64.8

tools/GORELEASER_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.7.0
1+
v2.8.1

tools/make/container.mk

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,17 @@ DOCKER_LABELS+= --label "org.opencontainers.image.licenses=$(LICENSE)"
3838
DOCKER_LABELS+= --label "org.opencontainers.image.documentation=$(DOCUMENTATION_URL)"
3939
DOCKER_LABELS+= --label "org.opencontainers.image.vendor=$(VENDOR_NAME)"
4040

41+
DOCKER_ANNOTATIONS:= --annotation "org.opencontainers.image.title=$(CMDNAME)"
42+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.description=$(DESCRIPTION)"
43+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.url=$(SOURCE_URL)"
44+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.source=$(SOURCE_URL)"
45+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.version=$(REPO_TAG)"
46+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.created=$(CONTAINER_BUILD_DATE)"
47+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.revision=$(shell git rev-parse HEAD 2>/dev/null)"
48+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.licenses=$(LICENSE)"
49+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.documentation=$(DOCUMENTATION_URL)"
50+
DOCKER_ANNOTATIONS+= --annotation "org.opencontainers.image.vendor=$(VENDOR_NAME)"
51+
4152
.PHONY: docker/%/multiarch
4253
docker/%/multiarch:
4354
$(eval ACTION:= $(word 1,$(subst /, , $*)))
@@ -49,6 +60,7 @@ docker/%/multiarch:
4960
--provenance=false \
5061
$(IMAGE_TAGS) \
5162
$(DOCKER_LABELS) \
63+
$(DOCKER_ANNOTATIONS) \
5264
--file ./Dockerfile $(OUTPUT_DIR) $(ADDITIONAL_PARAMETER)
5365

5466
.PHONY: docker/build/%
@@ -59,8 +71,9 @@ docker/build/%:
5971
$(info Building image for $(OS) $(ARCH) $(ARM))
6072
$(DOCKER_CMD) build --platform $* \
6173
--build-arg CMD_NAME=$(CMDNAME) \
62-
$(DOCKER_LABELS) \
6374
$(IMAGE_TAGS) \
75+
$(DOCKER_LABELS) \
76+
$(DOCKER_ANNOTATIONS) \
6477
--file ./Dockerfile $(OUTPUT_DIR)
6578

6679
.PHONY: docker/setup/multiarch

0 commit comments

Comments
 (0)