MyFavMirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-02-15 10:52:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

update to go 1.24 (#2427)

Browse Source
This commit is contained in:
Kristoffer Dalby 2025-02-14 10:56:03 +01:00 committed by GitHub
parent c61fbe9c5f
commit 604f7f6282
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.goreleaser.yml
View File

@ -2,7 +2,7 @@
version: 2 version: 2
before: before:
hooks: hooks:
- go mod tidy -compat=1.22 - go mod tidy -compat=1.24
- go mod vendor - go mod vendor
release: release:

2
CHANGELOG.md
View File

@ -4,6 +4,8 @@
### Changes ### Changes
- Use Go 1.24
[#2427](https://github.com/juanfont/headscale/pull/2427)
- `oidc.map_legacy_users` and `oidc.strip_email_domain` has been removed - `oidc.map_legacy_users` and `oidc.strip_email_domain` has been removed
[#2411](https://github.com/juanfont/headscale/pull/2411) [#2411](https://github.com/juanfont/headscale/pull/2411)
- Add more information to `/debug` endpoint - Add more information to `/debug` endpoint

2
Dockerfile.integration
View File

@ -2,7 +2,7 @@
# and are in no way endorsed by Headscale's maintainers as an # and are in no way endorsed by Headscale's maintainers as an
# official nor supported release or distribution. # official nor supported release or distribution.
FROM docker.io/golang:1.23-bookworm FROM docker.io/golang:1.24-bookworm
ARG VERSION=dev ARG VERSION=dev
ENV GOPATH /go ENV GOPATH /go
WORKDIR /go/src/headscale WORKDIR /go/src/headscale

2
Dockerfile.tailscale-HEAD
View File

@ -4,7 +4,7 @@
# This Dockerfile is more or less lifted from tailscale/tailscale # This Dockerfile is more or less lifted from tailscale/tailscale
# to ensure a similar build process when testing the HEAD of tailscale. # to ensure a similar build process when testing the HEAD of tailscale.
FROM golang:1.23-alpine AS build-env FROM golang:1.24-alpine AS build-env
WORKDIR /go/src WORKDIR /go/src

6
flake.lock generated
View File

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739019272, "lastModified": 1739319052,
"narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=", "narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa35a3c8e17a3de613240fea68f876e5b4896aec", "rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View File

@ -18,7 +18,7 @@
{ {
overlay = _: prev: let overlay = _: prev: let
pkgs = nixpkgs.legacyPackages.${prev.system}; pkgs = nixpkgs.legacyPackages.${prev.system};
buildGo = pkgs.buildGo123Module; buildGo = pkgs.buildGo124Module;
in { in {
headscale = buildGo { headscale = buildGo {
pname = "headscale"; pname = "headscale";
@ -97,6 +97,10 @@
gofumpt = prev.gofumpt.override { gofumpt = prev.gofumpt.override {
buildGoModule = buildGo; buildGoModule = buildGo;
}; };
gopls = prev.gopls.override {
buildGoModule = buildGo;
};
}; };
} }
// flake-utils.lib.eachDefaultSystem // flake-utils.lib.eachDefaultSystem
@ -105,7 +109,7 @@
overlays = [self.overlay]; overlays = [self.overlay];
inherit system; inherit system;
}; };
buildDeps = with pkgs; [git go_1_23 gnumake]; buildDeps = with pkgs; [git go_1_24 gnumake];
devDeps = with pkgs; devDeps = with pkgs;
buildDeps buildDeps
++ [ ++ [
@ -117,6 +121,7 @@
gotestsum gotestsum
gotests gotests
gofumpt gofumpt
gopls
ksh ksh
ko ko
yq-go yq-go

4
go.mod
View File

@ -1,9 +1,10 @@
module github.com/juanfont/headscale module github.com/juanfont/headscale
go 1.23.1 go 1.24
require ( require (
github.com/AlecAivazis/survey/v2 v2.3.7 github.com/AlecAivazis/survey/v2 v2.3.7
github.com/arl/statsviz v0.6.0
github.com/cenkalti/backoff/v4 v4.3.0 github.com/cenkalti/backoff/v4 v4.3.0
github.com/chasefleming/elem-go v0.30.0 github.com/chasefleming/elem-go v0.30.0
github.com/coder/websocket v1.8.12 github.com/coder/websocket v1.8.12
@ -89,7 +90,6 @@ require (
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/akutz/memconn v0.1.0 // indirect github.com/akutz/memconn v0.1.0 // indirect
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
github.com/arl/statsviz v0.6.0 // indirect
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect