From 4e3a6100b9cf4983f80f91f33d62008cc92a6df7 Mon Sep 17 00:00:00 2001 From: "F." Date: Sat, 14 Feb 2026 14:37:29 +0100 Subject: [PATCH 1/2] chore(ci) cap bump actions/upload-artifact@v4 to actions/upload-artifact@v6 --- .github/workflows/codacy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml index f537e1d..7bf05ba 100644 --- a/.github/workflows/codacy.yml +++ b/.github/workflows/codacy.yml @@ -112,7 +112,7 @@ jobs: PY - name: Upload SARIF chunks artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: codacy-sarif-chunks path: sarif-chunks/*.sarif From 98ff06ffd3dedae2d2e77f39f98ddd8f609f98ac Mon Sep 17 00:00:00 2001 From: "F." Date: Sat, 21 Feb 2026 21:22:35 +0100 Subject: [PATCH 2/2] chore(deps): bump golangci-lint to v2.10.1 and refresh deps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update golangci-lint version in Makefile, pre-commit hook, and project env - Bump Go deps: github.com/redis/rueidis v1.0.71 → v1.0.72; genproto/googleapis/rpc pseudo-version - Admin UI: upgrade eslint to v10, @types/node to v25, dayjs to v1.11.19; adjust eslint config for v10 compatibility - VS Code: add Snyk org auto-selection settings --- .pre-commit-config.yaml | 3 ++- .pre-commit/golangci-lint-hook | 2 +- .project-settings.env | 2 +- .vscode/settings.json | 4 +++- Makefile | 2 +- admin-ui/eslint.config.mjs | 13 +++++++++++++ admin-ui/package.json | 6 +++--- go.mod | 4 ++-- go.sum | 8 ++++---- 9 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d30537c..72e99f0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,8 @@ repos: cspell.json | admin-ui/package.json | admin-ui/package-lock.json | - admin-ui/tsconfig.json + admin-ui/tsconfig.json | + .vscode/settings.json )$ - id: end-of-file-fixer - id: mixed-line-ending diff --git a/.pre-commit/golangci-lint-hook b/.pre-commit/golangci-lint-hook index d963cf0..8c91ece 100755 --- a/.pre-commit/golangci-lint-hook +++ b/.pre-commit/golangci-lint-hook @@ -23,7 +23,7 @@ if [[ -f "${ROOT_DIR}/.project-settings.env" ]]; then # shellcheck disable=SC1090 source "${ROOT_DIR}/.project-settings.env" fi -GOLANGCI_LINT_VERSION="${GOLANGCI_LINT_VERSION:-v2.9.0}" +GOLANGCI_LINT_VERSION="${GOLANGCI_LINT_VERSION:-v2.10.1}" # ####################################### # Install dependencies to run the pre-commit hook diff --git a/.project-settings.env b/.project-settings.env index 0100e48..3b8fada 100644 --- a/.project-settings.env +++ b/.project-settings.env @@ -1,4 +1,4 @@ -GOLANGCI_LINT_VERSION=v2.9.0 +GOLANGCI_LINT_VERSION=v2.10.1 BUF_VERSION=v1.65.0 GO_VERSION=1.26.0 GCI_PREFIX=github.com/hyp3rd/go-worker diff --git a/.vscode/settings.json b/.vscode/settings.json index 802b4ce..83accbf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,7 @@ { "yaml.schemas": { "https://golangci-lint.run/jsonschema/golangci.jsonschema.json": "file:///Users/dy14uc/Developer/github.com/hyp3rd/go-worker/.golangci.yaml" - } + }, + "snyk.advanced.organization": "e3a23328-9b6e-43a2-acb5-e23bc7cfc9dc", + "snyk.advanced.autoSelectOrganization": true } diff --git a/Makefile b/Makefile index 19553b3..d9c94a6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include .project-settings.env REPO_ROOT = $(shell git rev-parse --show-toplevel) -GOLANGCI_LINT_VERSION ?= v2.9.0 +GOLANGCI_LINT_VERSION ?= v2.10.1 BUF_VERSION ?= v1.65.0 GO_VERSION ?= 1.26.0 GCI_PREFIX ?= github.com/hyp3rd/go-worker diff --git a/admin-ui/eslint.config.mjs b/admin-ui/eslint.config.mjs index 05e726d..d1b3072 100644 --- a/admin-ui/eslint.config.mjs +++ b/admin-ui/eslint.config.mjs @@ -2,9 +2,22 @@ import { defineConfig, globalIgnores } from "eslint/config"; import nextVitals from "eslint-config-next/core-web-vitals"; import nextTs from "eslint-config-next/typescript"; +const disabledReactRules = Object.fromEntries( + [...nextVitals, ...nextTs] + .flatMap((entry) => Object.keys(entry?.rules ?? {})) + .filter((rule) => rule.startsWith("react/")) + .map((rule) => [rule, "off"]), +); + const eslintConfig = defineConfig([ ...nextVitals, ...nextTs, + { + rules: { + // eslint-config-next@16.1.6 pulls eslint-plugin-react that is not ESLint v10 compatible. + ...disabledReactRules, + }, + }, // Override default ignores of eslint-config-next. globalIgnores([ // Default ignores of eslint-config-next: diff --git a/admin-ui/package.json b/admin-ui/package.json index 2ae691f..48f203b 100644 --- a/admin-ui/package.json +++ b/admin-ui/package.json @@ -9,17 +9,17 @@ "lint": "eslint" }, "dependencies": { - "dayjs": "^1.11.13", + "dayjs": "^1.11.19", "next": "16.1.6", "react": "^19.2.4", "react-dom": "^19.2.4" }, "devDependencies": { "@tailwindcss/postcss": "^4", - "@types/node": "^24.10.12", + "@types/node": "^25.3.0", "@types/react": "^19", "@types/react-dom": "^19", - "eslint": "^9.39.2", + "eslint": "^10.0.1", "eslint-config-next": "^16.1.6", "tailwindcss": "^4", "typescript": "^5" diff --git a/go.mod b/go.mod index 1ca0e9b..d655ad3 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/google/uuid v1.6.0 github.com/hyp3rd/ewrap v1.3.7 github.com/hyp3rd/sectools v1.2.2 - github.com/redis/rueidis v1.0.71 + github.com/redis/rueidis v1.0.72 github.com/robfig/cron/v3 v3.0.1 github.com/spf13/cobra v1.10.2 go.opentelemetry.io/otel/metric v1.40.0 @@ -32,5 +32,5 @@ require ( golang.org/x/net v0.50.0 // indirect golang.org/x/sys v0.41.0 // indirect golang.org/x/text v0.34.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect ) diff --git a/go.sum b/go.sum index 4351688..d12d0b1 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,8 @@ github.com/onsi/gomega v1.38.3 h1:eTX+W6dobAYfFeGC2PV6RwXRu/MyT+cQguijutvkpSM= github.com/onsi/gomega v1.38.3/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/rueidis v1.0.71 h1:pODtnAR5GAB7j4ekhldZ29HKOxe4Hph0GTDGk1ayEQY= -github.com/redis/rueidis v1.0.71/go.mod h1:lfdcZzJ1oKGKL37vh9fO3ymwt+0TdjkkUCJxbgpmcgQ= +github.com/redis/rueidis v1.0.72 h1:rc1ZUha266B7PYAeZp0OafXFcGz69WKy0aHtbkZzrJg= +github.com/redis/rueidis v1.0.72/go.mod h1:lfdcZzJ1oKGKL37vh9fO3ymwt+0TdjkkUCJxbgpmcgQ= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= @@ -72,8 +72,8 @@ golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 h1:mWPCjDEyshlQYzBpMNHaEof6UX1PmHcaUODUywQ0uac= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d h1:t/LOSXPJ9R0B6fnZNyALBRfZBH0Uy0gT+uR+SJ6syqQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.79.1 h1:zGhSi45ODB9/p3VAawt9a+O/MULLl9dpizzNNpq7flY= google.golang.org/grpc v1.79.1/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=