Compare commits

...

37 Commits

Author SHA1 Message Date
GitHub Actions 3fd85ce34f fix: upgrade Go to 1.25 for Caddy 2.10.2 compatibility
Caddy 2.10.2 requires Go 1.25 (declared in its go.mod). The previous
commit incorrectly downgraded to Go 1.23 based on the false assumption
that Go 1.25.5 doesn't exist.

This fix:
- Updates Dockerfile Go images from 1.23-alpine to 1.25-alpine
- Updates backend/go.mod to go 1.25
- Updates go.work to go 1.25

Fixes CI Docker build failures in xcaddy stage.
2025-12-14 01:06:03 +00:00
Jeremy 6deb5eb9f2 Merge branch 'development' into main 2025-12-13 19:50:15 -05:00
GitHub Actions 481208caf2 fix: correct Go version to 1.23 in Dockerfile (1.25.5 does not exist) 2025-12-14 00:44:27 +00:00
GitHub Actions 65443a1464 fix: correct Go version to 1.23 (1.25.5 does not exist) 2025-12-14 00:36:20 +00:00
GitHub Actions 71269fe041 fix: update Renovate token secret name from RENOVATOR_TOKEN to RENOVATE_TOKEN 2025-12-14 00:32:00 +00:00
GitHub Actions d1876b8dd7 fix: use RENOVATOR_TOKEN secret name 2025-12-14 00:30:45 +00:00
GitHub Actions eb6cf7f380 fix: use RENOVATE_TOKEN PAT for Renovate authentication 2025-12-14 00:23:21 +00:00
GitHub Actions 4331c798d9 fix: clean up .gitignore by removing VS Code settings while preserving shared configs 2025-12-14 00:20:27 +00:00
Jeremy 62747aa88f Merge pull request #386 from Wikid82/renovate/actions-checkout-5.x
chore(deps): update actions/checkout action to v5 - abandoned
2025-12-12 21:28:05 -05:00
Jeremy 5867b0f468 Merge branch 'development' into renovate/actions-checkout-5.x 2025-12-12 21:27:52 -05:00
Jeremy 1bce797a78 Merge pull request #385 from Wikid82/renovate/npm-minorpatch
chore(deps): update dependency markdownlint-cli2 to ^0.20.0
2025-12-12 21:27:22 -05:00
Jeremy d82f401f3b Merge pull request #384 from Wikid82/renovate/github.com-oschwald-geoip2-golang-2.x
fix(deps): update module github.com/oschwald/geoip2-golang to v2
2025-12-12 21:27:09 -05:00
Jeremy 9c17ec2df5 Merge pull request #383 from Wikid82/renovate/node-24.x
chore(deps): update dependency node to v24
2025-12-12 21:26:50 -05:00
Jeremy 85da974092 Merge branch 'development' into renovate/node-24.x 2025-12-12 21:26:43 -05:00
Jeremy 12cee833fc Merge pull request #382 from Wikid82/renovate/node-22.x
chore(deps): update dependency node to v22
2025-12-12 21:26:11 -05:00
Jeremy 6a7bb0db56 Merge pull request #381 from Wikid82/renovate/actions-setup-node-6.x
chore(deps): update actions/setup-node action to v6
2025-12-12 21:25:56 -05:00
Jeremy b1a2884cca Merge branch 'development' into renovate/actions-setup-node-6.x 2025-12-12 21:25:48 -05:00
Jeremy 88c78553a8 Merge pull request #380 from Wikid82/renovate/actions-setup-node-5.x
chore(deps): update actions/setup-node action to v5
2025-12-12 21:25:19 -05:00
Jeremy 193726c427 Merge pull request #379 from Wikid82/renovate/actions-github-script-8.x
chore(deps): update actions/github-script action to v8
2025-12-12 21:25:03 -05:00
renovate[bot] 9c02724c42 chore(deps): update dependency node to v24 2025-12-13 02:24:49 +00:00
Jeremy 6ca008fc57 Merge pull request #378 from Wikid82/renovate/actions-checkout-6.x
chore(deps): update actions/checkout action to v6
2025-12-12 21:24:46 -05:00
renovate[bot] 736037aaf7 chore(deps): update dependency node to v22 2025-12-13 02:24:45 +00:00
renovate[bot] 038c697cb1 chore(deps): update actions/setup-node action to v6 2025-12-13 02:24:43 +00:00
renovate[bot] 292745bae9 chore(deps): update actions/setup-node action to v5 2025-12-13 02:24:40 +00:00
renovate[bot] f3dd8d97b6 chore(deps): update actions/github-script action to v8 2025-12-13 02:24:37 +00:00
renovate[bot] 18677eeb48 chore(deps): update actions/checkout action to v6 2025-12-13 02:24:34 +00:00
renovate[bot] 20f5f0cbb2 chore(deps): update actions/checkout action to v5 2025-12-13 02:24:30 +00:00
Jeremy c5506c16f4 Merge pull request #377 from Wikid82/renovate/node-20.x
chore(deps): update dependency node to v20.19.6
2025-12-12 21:24:03 -05:00
renovate[bot] be099d9cea chore(deps): update dependency markdownlint-cli2 to ^0.20.0 2025-12-13 02:23:47 +00:00
Jeremy cad8045f79 Merge pull request #376 from Wikid82/renovate/actions-setup-node-digest
chore(deps): update actions/setup-node digest to 49933ea
2025-12-12 21:23:45 -05:00
renovate[bot] 42a6bc509a fix(deps): update module github.com/oschwald/geoip2-golang to v2 2025-12-13 02:23:34 +00:00
Jeremy 8e88e74f28 Merge pull request #375 from Wikid82/renovate/actions-github-script-digest
chore(deps): update actions/github-script digest to f28e40c
2025-12-12 21:23:29 -05:00
Jeremy 9091144b0b Merge pull request #374 from Wikid82/renovate/actions-checkout-digest
chore(deps): update actions/checkout digest to 34e1148
2025-12-12 21:22:54 -05:00
renovate[bot] c3ff2cb20c chore(deps): update dependency node to v20.19.6 2025-12-13 02:22:45 +00:00
renovate[bot] 9ed39cef8c chore(deps): update actions/setup-node digest to 49933ea 2025-12-13 02:22:41 +00:00
renovate[bot] 852376d597 chore(deps): update actions/github-script digest to f28e40c 2025-12-13 02:22:37 +00:00
renovate[bot] eddf5155a0 chore(deps): update actions/checkout digest to 34e1148 2025-12-13 02:22:33 +00:00
9 changed files with 1316 additions and 18 deletions
+5 -5
View File
@@ -37,21 +37,21 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
with: with:
fetch-depth: 2 fetch-depth: 2
- name: Set up Node.js - name: Set up Node.js
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4 uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
with: with:
node-version: '20' node-version: '24.12.0'
- name: Install dependencies - name: Install dependencies
run: npm install gray-matter run: npm install gray-matter
- name: Detect changed files - name: Detect changed files
id: changes id: changes
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
with: with:
script: | script: |
const fs = require('fs'); const fs = require('fs');
@@ -90,7 +90,7 @@ jobs:
- name: Process issue files - name: Process issue files
id: process id: process
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
env: env:
DRY_RUN: ${{ github.event.inputs.dry_run || 'false' }} DRY_RUN: ${{ github.event.inputs.dry_run || 'false' }}
with: with:
+1 -1
View File
@@ -23,6 +23,6 @@ jobs:
uses: renovatebot/github-action@502904f1cefdd70cba026cb1cbd8c53a1443e91b # v44.1.0 uses: renovatebot/github-action@502904f1cefdd70cba026cb1cbd8c53a1443e91b # v44.1.0
with: with:
configurationFile: .github/renovate.json configurationFile: .github/renovate.json
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.RENOVATE_TOKEN }}
env: env:
LOG_LEVEL: info LOG_LEVEL: info
+1 -6
View File
@@ -81,12 +81,7 @@ charon.db
*~ *~
.DS_Store .DS_Store
*.xcf *.xcf
# VS Code - ignore settings but keep shared configs
.vscode/*
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.vscode.backup*/
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Logs & Temp Files # Logs & Temp Files
+2 -2
View File
@@ -48,7 +48,7 @@ RUN --mount=type=cache,target=/app/frontend/node_modules/.cache \
npm run build npm run build
# ---- Backend Builder ---- # ---- Backend Builder ----
FROM --platform=$BUILDPLATFORM golang:1.25.5-alpine AS backend-builder FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS backend-builder
# Copy xx helpers for cross-compilation # Copy xx helpers for cross-compilation
COPY --from=xx / / COPY --from=xx / /
@@ -98,7 +98,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
# ---- Caddy Builder ---- # ---- Caddy Builder ----
# Build Caddy from source to ensure we use the latest Go version and dependencies # Build Caddy from source to ensure we use the latest Go version and dependencies
# This fixes vulnerabilities found in the pre-built Caddy images (e.g. CVE-2025-59530, stdlib issues) # This fixes vulnerabilities found in the pre-built Caddy images (e.g. CVE-2025-59530, stdlib issues)
FROM --platform=$BUILDPLATFORM golang:1.25.5-alpine AS caddy-builder FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS caddy-builder
ARG TARGETOS ARG TARGETOS
ARG TARGETARCH ARG TARGETARCH
ARG CADDY_VERSION ARG CADDY_VERSION
+2 -1
View File
@@ -1,6 +1,6 @@
module github.com/Wikid82/charon/backend module github.com/Wikid82/charon/backend
go 1.25.5 go 1.25
require ( require (
github.com/containrrr/shoutrrr v0.8.0 github.com/containrrr/shoutrrr v0.8.0
@@ -11,6 +11,7 @@ require (
github.com/google/uuid v1.6.0 github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.3 github.com/gorilla/websocket v1.5.3
github.com/oschwald/geoip2-golang v1.13.0 github.com/oschwald/geoip2-golang v1.13.0
github.com/oschwald/geoip2-golang/v2 v2.0.1
github.com/prometheus/client_golang v1.23.2 github.com/prometheus/client_golang v1.23.2
github.com/robfig/cron/v3 v3.0.1 github.com/robfig/cron/v3 v3.0.1
github.com/sirupsen/logrus v1.9.3 github.com/sirupsen/logrus v1.9.3
+1
View File
@@ -135,6 +135,7 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
github.com/oschwald/geoip2-golang v1.13.0 h1:Q44/Ldc703pasJeP5V9+aFSZFmBN7DKHbNsSFzQATJI= github.com/oschwald/geoip2-golang v1.13.0 h1:Q44/Ldc703pasJeP5V9+aFSZFmBN7DKHbNsSFzQATJI=
github.com/oschwald/geoip2-golang v1.13.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo= github.com/oschwald/geoip2-golang v1.13.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo=
github.com/oschwald/geoip2-golang/v2 v2.0.1/go.mod h1:qdVmcPgrTJ4q2eP9tHq/yldMTdp2VMr33uVdFbHBiBc=
github.com/oschwald/maxminddb-golang v1.13.0 h1:R8xBorY71s84yO06NgTmQvqvTvlS/bnYZrrWX1MElnU= github.com/oschwald/maxminddb-golang v1.13.0 h1:R8xBorY71s84yO06NgTmQvqvTvlS/bnYZrrWX1MElnU=
github.com/oschwald/maxminddb-golang v1.13.0/go.mod h1:BU0z8BfFVhi1LQaonTwwGQlsHUEu9pWNdMfmq4ztm0o= github.com/oschwald/maxminddb-golang v1.13.0/go.mod h1:BU0z8BfFVhi1LQaonTwwGQlsHUEu9pWNdMfmq4ztm0o=
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+1 -1
View File
@@ -1,3 +1,3 @@
go 1.25.5 go 1.25
use ./backend use ./backend
+1302 -1
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -8,6 +8,6 @@
"tldts": "^7.0.19" "tldts": "^7.0.19"
}, },
"devDependencies": { "devDependencies": {
"markdownlint-cli2": "^0.15.0" "markdownlint-cli2": "^0.20.0"
} }
} }