Skip to content

Commit 88a527f

Browse files
authored
Merge pull request #106 from hyp3rd/feat/260511-deps-update
chore: update dependencies and proto generated files
2 parents 361777e + 6701977 commit 88a527f

11 files changed

Lines changed: 582 additions & 513 deletions

File tree

.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ run:
4242
# Define the Go version limit.
4343
# Mainly related to generics support since go1.18.
4444
# Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.17
45-
go: "1.26.3"
45+
go: "1.26.4"
4646

4747
linters:
4848
# Enable specific linter

.pre-commit/unit-test-hook

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ hook() {
2121
local root_dir
2222
root_dir=$(git rev-parse --show-toplevel)
2323

24-
local toolchain_version="1.26.3"
24+
local toolchain_version="1.26.4"
2525
if [[ -f "${root_dir}/.project-settings.env" ]]; then
2626
# shellcheck disable=SC1090
2727
source "${root_dir}/.project-settings.env"

.project-settings.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GOLANGCI_LINT_VERSION=v2.12.2
2-
BUF_VERSION=v1.69.0
3-
GO_VERSION=1.26.3
2+
BUF_VERSION=v1.70.0
3+
GO_VERSION=1.26.4
44
GCI_PREFIX=github.com/hyp3rd/go-worker
55
PROTO_ENABLED=true

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
ARG GO_VERSION=1.26.3
2+
ARG GO_VERSION=1.26.4
33
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder
44

55
WORKDIR /src

Dockerfile.worker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
ARG GO_VERSION=1.26.3
2+
ARG GO_VERSION=1.26.4
33
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder
44

55
WORKDIR /src

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ include .project-settings.env
22

33
REPO_ROOT = $(shell git rev-parse --show-toplevel)
44
GOLANGCI_LINT_VERSION ?= v2.12.2
5-
BUF_VERSION ?= v1.69.0
6-
GO_VERSION ?= 1.26.3
5+
BUF_VERSION ?= v1.70.0
6+
GO_VERSION ?= 1.26.4
77
GCI_PREFIX ?= github.com/hyp3rd/go-worker
88
PROTO_ENABLED ?= true
99
BENCHTIME ?= 1s
@@ -36,8 +36,13 @@ workerctl:
3636
go build -trimpath -o bin/workerctl ./cmd/workerctl
3737

3838
update-deps:
39+
@echo "Updating Go module dependencies..."
3940
go get -u -t ./... && go mod tidy -v && go mod verify
4041

42+
@echo "\nUpdating npm dependencies for admin-ui..."
43+
cd admin-ui/ && npm update -a
44+
45+
4146
init:
4247
./setup-project.sh --module $(shell grep "^module " go.mod | awk '{print $$2}')
4348
$(MAKE) prepare-toolchain

0 commit comments

Comments
 (0)