update golang

childe · Aug 6, 2024 · 310b012 · 310b012
1 parent 22f96b8
commit 310b012
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -3,7 +3,7 @@ name: Build and Push Docker Image
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   docker-build-push:
@@ -20,7 +20,7 @@ jobs:
           go-version: 1.22
 
       - name: Test
-        run: go test -v ./...
+        run: make test
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine3.15 as build
+FROM golang:1.22 as build
 
 RUN apk update && apk add make
 
@@ -7,7 +7,7 @@ COPY . .
 
 RUN make
 
-FROM alpine:3.15
+FROM alpine:3.20
 
 ARG TZ="Asia/Shanghai"
 ENV TZ ${TZ}
@@ -16,4 +16,4 @@ RUN apk upgrade --update
 RUN apk --update add tzdata
 RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
 
-COPY --from=build /gohangout/build/gohangout /usr/local/bin/
+COPY --from=build /gohangout/gohangout /usr/local/bin/
diff --git a/Makefile b/Makefile
@@ -4,16 +4,15 @@ tag?=$(hash)
 .PHONY: gohangout all clean check test docker linux-binary
 
 gohangout:
-	mkdir -p build/
-	CGO_ENABLED=0 go build -ldflags "-X main.version=$(hash)" -o build/gohangout
+	CGO_ENABLED=0 go build -ldflags "-X main.version=$(hash)" -o gohangout
 
 linux-binary:
 	mkdir -p build
 	@echo "Building gohangout binary in docker container"
 	@if [ -n "$(GOPATH)" ]; then\
-		docker run -e CGO_ENABLED=0 -v $(GOPATH):/go -v $(PWD):/gohangout -w /gohangout golang:1.18 go build -ldflags "-X main.version=$(hash)" -o build/gohangout;\
+		docker run -e CGO_ENABLED=0 -v $(GOPATH):/go -v $(PWD):/gohangout -w /gohangout golang:1.22 go build -ldflags "-X main.version=$(hash)" -o build/gohangout;\
 	else\
-		docker run -e CGO_ENABLED=0 -v $(PWD):/gohangout -w /gohangout golang:1.18 go build -ldflags "-X main.version=$(hash)" -o build/gohangout;\
+		docker run -e CGO_ENABLED=0 -v $(PWD):/gohangout -w /gohangout golang:1.22 go build -ldflags "-X main.version=$(hash)" -o build/gohangout;\
 	fi
 
 docker: linux-binary
@@ -31,10 +30,10 @@ all: check
 	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X main.version=$(hash)" -o build/gohangout-darwin-x64-$(tag)
 
 clean:
-	rm -rf build/*
+	rm -rf gohangout
 
 check:
 	git diff-index --quiet HEAD --
 
 test:
-	go test -v ./...  -covermode=atomic -coverprofile=coverage.out
+	go test -v -gcflags="all=-N -l" ./...