From 604f7f62829ab24e691a6c9698f1f0c4a12d78b1 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Fri, 14 Feb 2025 10:56:03 +0100 Subject: [PATCH] update to go 1.24 (#2427) --- .goreleaser.yml | 2 +- CHANGELOG.md | 2 ++ Dockerfile.integration | 2 +- Dockerfile.tailscale-HEAD | 2 +- flake.lock | 6 +++--- flake.nix | 9 +++++++-- go.mod | 4 ++-- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a1cb6ef1..51f7b3f0 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -2,7 +2,7 @@ version: 2 before: hooks: - - go mod tidy -compat=1.22 + - go mod tidy -compat=1.24 - go mod vendor release: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d783074..f6a18a5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### 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 [#2411](https://github.com/juanfont/headscale/pull/2411) - Add more information to `/debug` endpoint diff --git a/Dockerfile.integration b/Dockerfile.integration index 95d07375..e9f1d865 100644 --- a/Dockerfile.integration +++ b/Dockerfile.integration @@ -2,7 +2,7 @@ # and are in no way endorsed by Headscale's maintainers as an # official nor supported release or distribution. -FROM docker.io/golang:1.23-bookworm +FROM docker.io/golang:1.24-bookworm ARG VERSION=dev ENV GOPATH /go WORKDIR /go/src/headscale diff --git a/Dockerfile.tailscale-HEAD b/Dockerfile.tailscale-HEAD index 82f7a8d9..0ee93eb4 100644 --- a/Dockerfile.tailscale-HEAD +++ b/Dockerfile.tailscale-HEAD @@ -4,7 +4,7 @@ # This Dockerfile is more or less lifted from tailscale/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 diff --git a/flake.lock b/flake.lock index fc77387a..c77f201f 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739019272, - "narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=", + "lastModified": 1739319052, + "narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa35a3c8e17a3de613240fea68f876e5b4896aec", + "rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 789133fd..e146591a 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ { overlay = _: prev: let pkgs = nixpkgs.legacyPackages.${prev.system}; - buildGo = pkgs.buildGo123Module; + buildGo = pkgs.buildGo124Module; in { headscale = buildGo { pname = "headscale"; @@ -97,6 +97,10 @@ gofumpt = prev.gofumpt.override { buildGoModule = buildGo; }; + + gopls = prev.gopls.override { + buildGoModule = buildGo; + }; }; } // flake-utils.lib.eachDefaultSystem @@ -105,7 +109,7 @@ overlays = [self.overlay]; inherit system; }; - buildDeps = with pkgs; [git go_1_23 gnumake]; + buildDeps = with pkgs; [git go_1_24 gnumake]; devDeps = with pkgs; buildDeps ++ [ @@ -117,6 +121,7 @@ gotestsum gotests gofumpt + gopls ksh ko yq-go diff --git a/go.mod b/go.mod index a5b9de7b..ed1f31c4 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,10 @@ module github.com/juanfont/headscale -go 1.23.1 +go 1.24 require ( 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/chasefleming/elem-go v0.30.0 github.com/coder/websocket v1.8.12 @@ -89,7 +90,6 @@ require ( github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/akutz/memconn v0.1.0 // 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/config v1.27.11 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect