Merge pull request #699 from mackerelio/go124

use Go 1.24

Author: yseto

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
           cache: true
       - run: make all
       - uses: actions/upload-artifact@v4

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine AS builder
+FROM golang:1.24-alpine AS builder
 RUN apk add --no-cache make git
 WORKDIR /go/src/github.com/mackerelio/mkr/
 COPY . .

Makefile

@@ -7,10 +7,6 @@ export CGO_ENABLED := 0
 .PHONY: all
 all: clean cross test rpm deb
 
-.PHONY: devel-deps
-devel-deps:
-	go install github.com/Songmu/goxz/cmd/goxz
-
 .PHONY: test
 test:
 	go test -v ./...
@@ -20,10 +16,10 @@ build:
 	go build -ldflags=$(BUILD_LDFLAGS) -o $(BIN) .
 
 .PHONY: cross
-cross: devel-deps
-	goxz -d snapshot -os darwin -arch amd64,arm64 \
+cross:
+	go tool github.com/Songmu/goxz/cmd/goxz -d snapshot -os darwin -arch amd64,arm64 \
 	  -build-ldflags=$(BUILD_LDFLAGS)
-	goxz -d snapshot -os linux -arch 386,amd64,arm64,arm \
+	go tool github.com/Songmu/goxz/cmd/goxz -d snapshot -os linux -arch 386,amd64,arm64,arm \
 	  -build-ldflags=$(BUILD_LDFLAGS)
 
 .PHONY: rpm

go.mod

@@ -1,11 +1,10 @@
 module github.com/mackerelio/mkr
 
-go 1.23.0
+go 1.24.0
 
-toolchain go1.23.7
+toolchain go1.24.2
 
 require (
-	github.com/Songmu/goxz v0.9.1
 	github.com/Songmu/prompter v0.5.1
 	github.com/Songmu/retry v0.1.0
 	github.com/Songmu/wrapcommander v0.1.0
@@ -31,6 +30,7 @@ require (
 
 require (
 	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/Songmu/goxz v0.9.1 // indirect
 	github.com/Songmu/timeout v0.4.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/andybalholm/brotli v1.0.4 // indirect
@@ -68,3 +68,5 @@ require (
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+tool github.com/Songmu/goxz/cmd/goxz

go.sum

@@ -86,8 +86,6 @@ github.com/mackerelio/golib v1.2.1 h1:SDcDn6Jw3p9bi1N0bg1Z/ilG5qcBB23qL8xNwrU0gg
 github.com/mackerelio/golib v1.2.1/go.mod h1:b8ZaapsHGH1FlEJlCqfD98CqafLeyMevyATDlID2BsM=
 github.com/mackerelio/mackerel-agent v0.84.0 h1:tfFIGbPdiRiUsZG7Nd4o5/tpR76Bgk1NBVs6USJCQHo=
 github.com/mackerelio/mackerel-agent v0.84.0/go.mod h1:kVwLWoJZmcs1mhLnsMUihdxUKgfK4edMkvJMCgBE43M=
-github.com/mackerelio/mackerel-client-go v0.36.0 h1:/dLedCmGWpo1cIKi5BB8QYtbA8w/R8McieleQ+Vme8w=
-github.com/mackerelio/mackerel-client-go v0.36.0/go.mod h1:EJom2FXbK0Akv61dVsRiH9oKggk4IWlgb6hrQtGK1Z4=
 github.com/mackerelio/mackerel-client-go v0.37.0 h1:53s5mP1JpCB8JCPpz1aP3iyvfGFC+pOA7L05ZgEmNA8=
 github.com/mackerelio/mackerel-client-go v0.37.0/go.mod h1:EJom2FXbK0Akv61dVsRiH9oKggk4IWlgb6hrQtGK1Z4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=