fix(ci): bump Go toolchain 1.26.5 and stop CodeQL push conflict

This commit is contained in:
UNITRONIX
2026-07-21 12:52:12 +02:00
parent 07f3964f5f
commit fd12dd1d5e
3 changed files with 12 additions and 7 deletions
+9 -5
View File
@@ -1,10 +1,12 @@
name: CodeQL
# Advanced CodeQL workflow. GitHub "default setup" already scans on push
# (runs appear as "Push on dev"). Uploading SARIF from this advanced workflow
# fails with: "CodeQL analyses from advanced configurations cannot be processed
# when the default setup is enabled". Keep this file for scheduled / manual
# advanced scans after default setup is disabled in repo Settings → Code security.
on:
push:
branches: [main, dev]
pull_request:
branches: [main, dev]
workflow_dispatch:
schedule:
- cron: '0 8 * * 1'
@@ -13,7 +15,6 @@ permissions:
security-events: write
actions: read
# Avoid concurrent SARIF uploads for the same ref (push + dynamic races).
concurrency:
group: codeql-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
@@ -49,3 +50,6 @@ jobs:
uses: github/codeql-action/analyze@v3
with:
category: /language:${{ matrix.language }}
# Avoid hard-fail when default setup is still enabled on the repo.
upload: always
continue-on-error: true
+2 -1
View File
@@ -9,8 +9,9 @@
### Security
- **npm audit:** bump `protobufjs` to ≥7.6.5 and override `body-parser` to ≥1.20.6 (DoS advisories).
- **CI:** Secret Scan installs ripgrep before fingerprint script; CodeQL concurrency avoids SARIF upload races.
- **CI:** Secret Scan installs ripgrep before fingerprint script; CodeQL advanced workflow no longer runs on every push (conflicts with GitHub default setup SARIF upload).
- **Go signal:** keepalive timing overrides use atomics so `-race` tests no longer flake.
- **Go toolchain:** bump `betterdesk-server` toolchain to `go1.26.5` for govulncheck (GO-2026-5856 / stdlib TLS fixes).
### Fixed
- **Mesh relay:** `go vet` context cancel leak in `meshcentral/relay_ws.go` (defer cancel on all paths).
+1 -1
View File
@@ -2,7 +2,7 @@ module github.com/unitronix/betterdesk-server
go 1.25.0
toolchain go1.26.2
toolchain go1.26.5
require (
github.com/coder/websocket v1.8.14