Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ run:
# Define the Go version limit.
# Mainly related to generics support since go1.18.
# Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.17
go: "1.26.3"
go: "1.26.4"

linters:
# Enable specific linter
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit/unit-test-hook
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ hook() {
local root_dir
root_dir=$(git rev-parse --show-toplevel)

local toolchain_version="1.26.3"
local toolchain_version="1.26.4"
if [[ -f "${root_dir}/.project-settings.env" ]]; then
# shellcheck disable=SC1090
source "${root_dir}/.project-settings.env"
Expand Down
4 changes: 2 additions & 2 deletions .project-settings.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GOLANGCI_LINT_VERSION=v2.12.2
BUF_VERSION=v1.69.0
GO_VERSION=1.26.3
BUF_VERSION=v1.70.0
GO_VERSION=1.26.4
GCI_PREFIX=github.com/hyp3rd/go-worker
PROTO_ENABLED=true
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG GO_VERSION=1.26.3
ARG GO_VERSION=1.26.4
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder

WORKDIR /src
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.worker
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG GO_VERSION=1.26.3
ARG GO_VERSION=1.26.4
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder

WORKDIR /src
Expand Down
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ include .project-settings.env

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

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

@echo "\nUpdating npm dependencies for admin-ui..."
cd admin-ui/ && npm update -a


init:
./setup-project.sh --module $(shell grep "^module " go.mod | awk '{print $$2}')
$(MAKE) prepare-toolchain
Expand Down
Loading
Loading