From f519c513c2f4002bfe98020a4a8348ae4f3e46f2 Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 3 Sep 2022 12:21:04 +0200 Subject: [PATCH 1/5] Target go 1.19 in go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c934a461..1afc819b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/juanfont/headscale -go 1.18 +go 1.19 require ( github.com/AlecAivazis/survey/v2 v2.3.5 From 2ddf7ab51542ee0529f48b29e36ea1dacb163739 Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 3 Sep 2022 12:21:35 +0200 Subject: [PATCH 2/5] Use Go 1.19 in Dockerfiles --- Dockerfile | 2 +- Dockerfile.alpine | 2 +- Dockerfile.debug | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9139f09..4a83c462 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Builder image -FROM docker.io/golang:1.18.0-bullseye AS build +FROM docker.io/golang:1.19.0-bullseye AS build ARG VERSION=dev ENV GOPATH /go WORKDIR /go/src/headscale diff --git a/Dockerfile.alpine b/Dockerfile.alpine index de683f2d..bc0800bb 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,5 +1,5 @@ # Builder image -FROM docker.io/golang:1.18.0-alpine AS build +FROM docker.io/golang:1.19.0-alpine AS build ARG VERSION=dev ENV GOPATH /go WORKDIR /go/src/headscale diff --git a/Dockerfile.debug b/Dockerfile.debug index 9b1b7c6b..ef849185 100644 --- a/Dockerfile.debug +++ b/Dockerfile.debug @@ -1,5 +1,5 @@ # Builder image -FROM docker.io/golang:1.18.0-bullseye AS build +FROM docker.io/golang:1.19.0-bullseye AS build ARG VERSION=dev ENV GOPATH /go WORKDIR /go/src/headscale From 84044e236d4e4ca13507a78b49b3ea7a7102e8c4 Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 3 Sep 2022 12:21:54 +0200 Subject: [PATCH 3/5] Release using go 1.19 --- .github/workflows/release.yml | 2 +- .goreleaser.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e17721db..ba5ea7a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.18.0 + go-version: 1.19.0 - name: Install dependencies run: | diff --git a/.goreleaser.yml b/.goreleaser.yml index eb9cf783..e776b5a7 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,7 +1,7 @@ --- before: hooks: - - go mod tidy -compat=1.18 + - go mod tidy -compat=1.19 release: prerelease: auto From dd3ec840009342ce3ab87b66d7037ea9764b3265 Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 3 Sep 2022 12:22:03 +0200 Subject: [PATCH 4/5] Minor doc change --- docs/running-headscale-openbsd.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/running-headscale-openbsd.md b/docs/running-headscale-openbsd.md index dcd1c9bb..7ab486bb 100644 --- a/docs/running-headscale-openbsd.md +++ b/docs/running-headscale-openbsd.md @@ -17,7 +17,7 @@ describing how to make `headscale` run properly in a server environment. ```shell # Install prerequistes -# 1. go v1.18+: headscale newer than 0.15 needs go 1.18+ to compile +# 1. go v1.19+: headscale newer than 0.17 needs go 1.19+ to compile # 2. gmake: Makefile in the headscale repo is written in GNU make syntax pkg_add -D snap go pkg_add gmake @@ -46,7 +46,7 @@ cp headscale /usr/local/sbin ```shell # Install prerequistes -# 1. go v1.18+: headscale newer than 0.15 needs go 1.18+ to compile +# 1. go v1.19+: headscale newer than 0.17 needs go 1.19+ to compile # 2. gmake: Makefile in the headscale repo is written in GNU make syntax git clone https://github.com/juanfont/headscale.git From 2c5bf6982c5eaededf77f9c0c8b487c9312d6a8d Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 3 Sep 2022 12:24:22 +0200 Subject: [PATCH 5/5] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b66931c..917afd4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added support for Tailscale TS2021 protocol [#738](https://github.com/juanfont/headscale/pull/738) - Add ability to specify config location via env var `HEADSCALE_CONFIG` [#674](https://github.com/juanfont/headscale/issues/674) +- Target Go 1.19 for Headscale [#778](https://github.com/juanfont/headscale/pull/778) ## 0.16.4 (2022-08-21)