Skip to content

Commit 8081839

Browse files
SlessiSlessi
committed
chore: add gomock version to docker & make
Add GOMOCK_VERSION to Dockerfile and Makefile Signed-off-by: Edward Sammut Alessi <[email protected]>
1 parent 54bfaf6 commit 8081839

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-09-03T17:04:54Z by kres 784fa1f.
3+
# Generated on 2025-09-11T13:56:21Z by kres 953994c.
44

55
concurrency:
66
group: ${{ github.head_ref || github.run_id }}
@@ -26,8 +26,7 @@ jobs:
2626
packages: write
2727
pull-requests: read
2828
runs-on:
29-
- self-hosted
30-
- generic
29+
group: generic
3130
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
3231
steps:
3332
- name: gather-system-info

‎.github/workflows/slack-notify-ci-failure.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-09-03T17:04:54Z by kres 784fa1f.
3+
# Generated on 2025-09-11T13:56:21Z by kres 953994c.
44

55
"on":
66
workflow_run:
@@ -14,8 +14,7 @@ name: slack-notify-failure
1414
jobs:
1515
slack-notify:
1616
runs-on:
17-
- self-hosted
18-
- generic
17+
group: generic
1918
if: github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event != 'pull_request'
2019
steps:
2120
- name: Slack Notify

‎.github/workflows/slack-notify.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-09-03T17:04:54Z by kres 784fa1f.
3+
# Generated on 2025-09-11T13:56:21Z by kres 953994c.
44

55
"on":
66
workflow_run:
@@ -12,8 +12,7 @@ name: slack-notify
1212
jobs:
1313
slack-notify:
1414
runs-on:
15-
- self-hosted
16-
- generic
15+
group: generic
1716
if: github.event.workflow_run.conclusion != 'skipped'
1817
steps:
1918
- name: Get PR number

‎.kres.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ spec:
6868
GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
6969
GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
7070
GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)"
71+
GOMOCK_VERSION="$(GOMOCK_VERSION)"
7172
PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)"
7273
GRPC_GO_VERSION="$(GRPC_GO_VERSION)"
7374
GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)"
@@ -103,6 +104,7 @@ spec:
103104
GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
104105
GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
105106
GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)"
107+
GOMOCK_VERSION="$(GOMOCK_VERSION)"
106108
PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)"
107109
GRPC_GO_VERSION="$(GRPC_GO_VERSION)"
108110
GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)"
@@ -135,6 +137,7 @@ spec:
135137
GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
136138
GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
137139
GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)"
140+
GOMOCK_VERSION="$(GOMOCK_VERSION)"
138141
PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)"
139142
GRPC_GO_VERSION="$(GRPC_GO_VERSION)"
140143
GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)"
@@ -170,6 +173,7 @@ spec:
170173
GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
171174
GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
172175
GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)"
176+
GOMOCK_VERSION="$(GOMOCK_VERSION)"
173177
PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)"
174178
GRPC_GO_VERSION="$(GRPC_GO_VERSION)"
175179
GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)"

‎Makefile‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-09-03T17:04:54Z by kres 784fa1f.
3+
# Generated on 2025-09-11T13:56:21Z by kres 953994c.
44

55
# common variables
66

@@ -240,6 +240,9 @@ lint-markdown: ## Runs markdownlint.
240240
.PHONY: lint
241241
lint: lint-golangci-lint lint-gofumpt lint-govulncheck lint-markdown ## Run all linters for the project.
242242

243+
.PHONY: lint-fmt
244+
lint-fmt: lint-golangci-lint-fmt ## Run all linter formatters and fix up the source tree.
245+
243246
.PHONY: image-talemu
244247
image-talemu: ## Builds image for talemu.
245248
@$(MAKE) registry-$@ IMAGE_NAME="talemu"
@@ -260,19 +263,19 @@ image-talemu-infra-provider: ## Builds image for talemu-infra-provider.
260263

261264
.PHONY: docker-compose-up
262265
docker-compose-up:
263-
ARTIFACTS="$(ARTIFACTS)" SHA="$(SHA)" TAG="$(TAG)" USERNAME="$(USERNAME)" REGISTRY="$(REGISTRY)" PROTOBUF_TS_VERSION="$(PROTOBUF_TS_VERSION)" NODE_BUILD_ARGS="$(NODE_BUILD_ARGS)" TOOLCHAIN="$(TOOLCHAIN)" CGO_ENABLED="$(CGO_ENABLED)" GO_BUILDFLAGS="$(GO_BUILDFLAGS)" GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)" GOFUMPT_VERSION="$(GOFUMPT_VERSION)" GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)" PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)" GRPC_GO_VERSION="$(GRPC_GO_VERSION)" GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)" VTPROTOBUF_VERSION="$(VTPROTOBUF_VERSION)" DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)" TESTPKGS="$(TESTPKGS)" COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 GO_LDFLAGS="$(GO_LDFLAGS)" docker compose -p talemu --file ./hack/compose/docker-compose.yml --file ./hack/compose/docker-compose.override.yml up --build
266+
ARTIFACTS="$(ARTIFACTS)" SHA="$(SHA)" TAG="$(TAG)" USERNAME="$(USERNAME)" REGISTRY="$(REGISTRY)" PROTOBUF_TS_VERSION="$(PROTOBUF_TS_VERSION)" NODE_BUILD_ARGS="$(NODE_BUILD_ARGS)" TOOLCHAIN="$(TOOLCHAIN)" CGO_ENABLED="$(CGO_ENABLED)" GO_BUILDFLAGS="$(GO_BUILDFLAGS)" GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)" GOFUMPT_VERSION="$(GOFUMPT_VERSION)" GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)" GOMOCK_VERSION="$(GOMOCK_VERSION)" PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)" GRPC_GO_VERSION="$(GRPC_GO_VERSION)" GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)" VTPROTOBUF_VERSION="$(VTPROTOBUF_VERSION)" DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)" TESTPKGS="$(TESTPKGS)" COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 GO_LDFLAGS="$(GO_LDFLAGS)" docker compose -p talemu --file ./hack/compose/docker-compose.yml --file ./hack/compose/docker-compose.override.yml up --build
264267

265268
.PHONY: docker-compose-down
266269
docker-compose-down:
267-
ARTIFACTS="$(ARTIFACTS)" SHA="$(SHA)" TAG="$(TAG)" USERNAME="$(USERNAME)" REGISTRY="$(REGISTRY)" PROTOBUF_TS_VERSION="$(PROTOBUF_TS_VERSION)" NODE_BUILD_ARGS="$(NODE_BUILD_ARGS)" TOOLCHAIN="$(TOOLCHAIN)" CGO_ENABLED="$(CGO_ENABLED)" GO_BUILDFLAGS="$(GO_BUILDFLAGS)" GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)" GOFUMPT_VERSION="$(GOFUMPT_VERSION)" GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)" PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)" GRPC_GO_VERSION="$(GRPC_GO_VERSION)" GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)" VTPROTOBUF_VERSION="$(VTPROTOBUF_VERSION)" DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)" TESTPKGS="$(TESTPKGS)" COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 GO_LDFLAGS="$(GO_LDFLAGS)" docker compose -p talemu --file ./hack/compose/docker-compose.yml --file ./hack/compose/docker-compose.override.yml down --rmi local --remove-orphans --volumes=$(REMOVE_VOLUMES)
270+
ARTIFACTS="$(ARTIFACTS)" SHA="$(SHA)" TAG="$(TAG)" USERNAME="$(USERNAME)" REGISTRY="$(REGISTRY)" PROTOBUF_TS_VERSION="$(PROTOBUF_TS_VERSION)" NODE_BUILD_ARGS="$(NODE_BUILD_ARGS)" TOOLCHAIN="$(TOOLCHAIN)" CGO_ENABLED="$(CGO_ENABLED)" GO_BUILDFLAGS="$(GO_BUILDFLAGS)" GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)" GOFUMPT_VERSION="$(GOFUMPT_VERSION)" GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)" GOMOCK_VERSION="$(GOMOCK_VERSION)" PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)" GRPC_GO_VERSION="$(GRPC_GO_VERSION)" GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)" VTPROTOBUF_VERSION="$(VTPROTOBUF_VERSION)" DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)" TESTPKGS="$(TESTPKGS)" COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 GO_LDFLAGS="$(GO_LDFLAGS)" docker compose -p talemu --file ./hack/compose/docker-compose.yml --file ./hack/compose/docker-compose.override.yml down --rmi local --remove-orphans --volumes=$(REMOVE_VOLUMES)
268271

269272
.PHONY: docker-compose-provider-up
270273
docker-compose-provider-up:
271-
ARTIFACTS="$(ARTIFACTS)" SHA="$(SHA)" TAG="$(TAG)" USERNAME="$(USERNAME)" REGISTRY="$(REGISTRY)" PROTOBUF_TS_VERSION="$(PROTOBUF_TS_VERSION)" NODE_BUILD_ARGS="$(NODE_BUILD_ARGS)" TOOLCHAIN="$(TOOLCHAIN)" CGO_ENABLED="$(CGO_ENABLED)" GO_BUILDFLAGS="$(GO_BUILDFLAGS)" GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)" GOFUMPT_VERSION="$(GOFUMPT_VERSION)" GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)" PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)" GRPC_GO_VERSION="$(GRPC_GO_VERSION)" GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)" VTPROTOBUF_VERSION="$(VTPROTOBUF_VERSION)" DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)" TESTPKGS="$(TESTPKGS)" COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 GO_LDFLAGS="$(GO_LDFLAGS)" docker compose -p talemu-infra-provider --file ./hack/compose/docker-compose-provider.yml --file ./hack/compose/docker-compose-provider.override.yml up --build
274+
ARTIFACTS="$(ARTIFACTS)" SHA="$(SHA)" TAG="$(TAG)" USERNAME="$(USERNAME)" REGISTRY="$(REGISTRY)" PROTOBUF_TS_VERSION="$(PROTOBUF_TS_VERSION)" NODE_BUILD_ARGS="$(NODE_BUILD_ARGS)" TOOLCHAIN="$(TOOLCHAIN)" CGO_ENABLED="$(CGO_ENABLED)" GO_BUILDFLAGS="$(GO_BUILDFLAGS)" GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)" GOFUMPT_VERSION="$(GOFUMPT_VERSION)" GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)" GOMOCK_VERSION="$(GOMOCK_VERSION)" PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)" GRPC_GO_VERSION="$(GRPC_GO_VERSION)" GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)" VTPROTOBUF_VERSION="$(VTPROTOBUF_VERSION)" DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)" TESTPKGS="$(TESTPKGS)" COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 GO_LDFLAGS="$(GO_LDFLAGS)" docker compose -p talemu-infra-provider --file ./hack/compose/docker-compose-provider.yml --file ./hack/compose/docker-compose-provider.override.yml up --build
272275

273276
.PHONY: docker-compose-provider-down
274277
docker-compose-provider-down:
275-
ARTIFACTS="$(ARTIFACTS)" SHA="$(SHA)" TAG="$(TAG)" USERNAME="$(USERNAME)" REGISTRY="$(REGISTRY)" PROTOBUF_TS_VERSION="$(PROTOBUF_TS_VERSION)" NODE_BUILD_ARGS="$(NODE_BUILD_ARGS)" TOOLCHAIN="$(TOOLCHAIN)" CGO_ENABLED="$(CGO_ENABLED)" GO_BUILDFLAGS="$(GO_BUILDFLAGS)" GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)" GOFUMPT_VERSION="$(GOFUMPT_VERSION)" GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)" PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)" GRPC_GO_VERSION="$(GRPC_GO_VERSION)" GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)" VTPROTOBUF_VERSION="$(VTPROTOBUF_VERSION)" DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)" TESTPKGS="$(TESTPKGS)" COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 GO_LDFLAGS="$(GO_LDFLAGS)" docker compose -p talemu-infra-provider --file ./hack/compose/docker-compose-provider.yml --file ./hack/compose/docker-compose-provider.override.yml down --rmi local --remove-orphans --volumes=$(REMOVE_VOLUMES)
278+
ARTIFACTS="$(ARTIFACTS)" SHA="$(SHA)" TAG="$(TAG)" USERNAME="$(USERNAME)" REGISTRY="$(REGISTRY)" PROTOBUF_TS_VERSION="$(PROTOBUF_TS_VERSION)" NODE_BUILD_ARGS="$(NODE_BUILD_ARGS)" TOOLCHAIN="$(TOOLCHAIN)" CGO_ENABLED="$(CGO_ENABLED)" GO_BUILDFLAGS="$(GO_BUILDFLAGS)" GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)" GOFUMPT_VERSION="$(GOFUMPT_VERSION)" GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)" GOMOCK_VERSION="$(GOMOCK_VERSION)" PROTOBUF_GO_VERSION="$(PROTOBUF_GO_VERSION)" GRPC_GO_VERSION="$(GRPC_GO_VERSION)" GRPC_GATEWAY_VERSION="$(GRPC_GATEWAY_VERSION)" VTPROTOBUF_VERSION="$(VTPROTOBUF_VERSION)" DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)" TESTPKGS="$(TESTPKGS)" COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 GO_LDFLAGS="$(GO_LDFLAGS)" docker compose -p talemu-infra-provider --file ./hack/compose/docker-compose-provider.yml --file ./hack/compose/docker-compose-provider.override.yml down --rmi local --remove-orphans --volumes=$(REMOVE_VOLUMES)
276279

277280
.PHONY: rekres
278281
rekres:

‎hack/compose/docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ services:
2121
- CGO_ENABLED=${CGO_ENABLED:?error}
2222
- GO_BUILDFLAGS=${GO_BUILDFLAGS}
2323
- GOLANGCILINT_VERSION=${GOLANGCILINT_VERSION:?error}
24+
- GOMOCK_VERSION=${GOMOCK_VERSION:?error}
2425
- GOFUMPT_VERSION=${GOFUMPT_VERSION:?error}
2526
- GOIMPORTS_VERSION=${GOIMPORTS_VERSION:?error}
2627
- PROTOBUF_GO_VERSION=${PROTOBUF_GO_VERSION:?error}

0 commit comments

Comments
 (0)