diff --git a/.github/renovate.json b/.github/renovate.json index 82182b43..461adba5 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -14,8 +14,11 @@ "labels": ["dependencies"], "rebaseWhen": "conflicted", "vulnerabilityAlerts": { "enabled": true }, - "schedule": ["every weekday"], + "schedule": ["before 4am on Monday"], "rangeStrategy": "bump", + "automerge": true, + "automergeType": "pr", + "platformAutomerge": true, "customManagers": [ { "customType": "regex", @@ -29,6 +32,11 @@ } ], "packageRules": [ + { + "description": "Automerge digest updates (action pins, Docker SHAs)", + "matchUpdateTypes": ["digest", "pin"], + "automerge": true + }, { "description": "Caddy transitive dependency patches in Dockerfile", "matchManagers": ["regex"], @@ -55,7 +63,7 @@ "matchManagers": ["gomod"], "labels": ["dependencies", "go"], "matchUpdateTypes": ["minor", "patch"], - "automerge": false + "automerge": true }, { "description": "GitHub Actions updates", diff --git a/.github/workflows/release-goreleaser.yml b/.github/workflows/release-goreleaser.yml index a6f46f45..8277b8a9 100644 --- a/.github/workflows/release-goreleaser.yml +++ b/.github/workflows/release-goreleaser.yml @@ -26,12 +26,12 @@ jobs: - name: Set up Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6 with: - go-version: '1.23.x' + go-version: '1.25.5' - name: Set up Node.js uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6 with: - node-version: '20.x' + node-version: '20.19.6' - name: Build Frontend working-directory: frontend diff --git a/.version b/.version index 1d0ba9ea..972ef76a 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.4.0 +0.7.9 diff --git a/backend/go.mod b/backend/go.mod index 4b44c643..fa69e381 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,6 +1,6 @@ module github.com/Wikid82/charon/backend -go 1.25 +go 1.25.5 require ( github.com/containrrr/shoutrrr v0.8.0 diff --git a/frontend/src/components/__tests__/LiveLogViewer.test.tsx b/frontend/src/components/__tests__/LiveLogViewer.test.tsx index e30fc0eb..eae7df6e 100644 --- a/frontend/src/components/__tests__/LiveLogViewer.test.tsx +++ b/frontend/src/components/__tests__/LiveLogViewer.test.tsx @@ -406,7 +406,7 @@ describe('LiveLogViewer', () => { // Use findBy queries (built-in waiting) instead of single waitFor with multiple assertions // This avoids race conditions where one failing assertion causes the entire block to retry await screen.findByText('10.0.0.1'); - await screen.findByText(/BLOCKED: SQL injection detected/); + await screen.findByText(/🚫 BLOCKED: SQL injection detected/); await screen.findByText(/\[SQL injection detected\]/); // For getAllByText, keep in waitFor but separate from other assertions diff --git a/go.work b/go.work index 166f9fc9..49e522aa 100644 --- a/go.work +++ b/go.work @@ -1,3 +1,3 @@ -go 1.25 +go 1.25.5 use ./backend diff --git a/go.work.sum b/go.work.sum index 1e280482..9aac90f5 100644 --- a/go.work.sum +++ b/go.work.sum @@ -42,6 +42,7 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oschwald/maxminddb-golang/v2 v2.1.1/go.mod h1:PLdx6PR+siSIoXqqy7C7r3SB3KZnhxWr1Dp6g0Hacl8= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=