Merge pull request #1631 from jinlinGuan/golang-1.23

build: Upgrade to go-1.23, Linter1.61.0 and Alpine 3.20
edgexfoundry · Oct 3, 2024 · 1b8f5c3 · 1b8f5c3
2 parents 473fc52 + 258bca7
commit 1b8f5c3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -2,3 +2,9 @@ linters:
   disable:
   enable:
     - gosec
+linters-settings:
+  gosec:
+    excludes:
+      # G115: integer overflow conversion
+      # exclude the rule since it tends to be false positive
+      - G115
diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ lint:
 	@if [ "z${ARCH}" = "zx86_64" ] && which golangci-lint >/dev/null ; then golangci-lint run --config .golangci.yml ; else echo "WARNING: Linting skipped (not on x86_64 or linter not installed)"; fi
 
 install-lint:
-	sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.54.2
+	sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.61.0
 
 test: unittest lint
 	GO111MODULE=on go vet ./...

diff --git a/example/cmd/device-simple/Dockerfile b/example/cmd/device-simple/Dockerfile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2023 Intel
+# Copyright (c) 2024 IOTech Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 # limitations under the License.
 #
 
-ARG BASE=golang:1.21-alpine3.18
+ARG BASE=golang:1.23-alpine3.20
 FROM ${BASE} AS builder
 
 ARG MAKE=make build
@@ -33,7 +34,7 @@ COPY . .
 RUN ${MAKE}
 
 # Next image - Copy built Go binary into new workspace
-FROM alpine:3.18
+FROM alpine:3.20
 LABEL license='SPDX-License-Identifier: Apache-2.0' \
   copyright='Copyright (c) 2022: Intel'
 

diff --git a/go.mod b/go.mod
@@ -1,12 +1,12 @@
 module github.com/edgexfoundry/device-sdk-go/v3
 
-go 1.21
+go 1.23
 
 require (
 	github.com/OneOfOne/xxhash v1.2.8
 	github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.60
 	github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.46
-	github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.35
+	github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.37
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/labstack/echo/v4 v4.11.4

diff --git a/go.sum b/go.sum
@@ -92,8 +92,8 @@ github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.17 h1:eNLGThT5fYtFLSr
 github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.17/go.mod h1:va3l+Nri1KijDM5KItsaYrwUSG3Nhj/4EDvR4uB+Jds=
 github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.46 h1:rivgaOszQTr568qpcJYamChuPcfR+qmmyzurADn/tNw=
 github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.46/go.mod h1:8MSv8MFJnUdjZUEfPpxEMQUskv5VENJQkKsroE7YKUM=
-github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.35 h1:ZKmq5Vd1QN86OLTbD8A2JIKTxR8k21gtqmEUS3hApBY=
-github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.35/go.mod h1:SUTdo8v9V+XacowkZP5puBXnBcVP2NDSk5PBzOdsLEk=
+github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.37 h1:nWbivwRCUjIcpLkZKR64P6YfAColwKYwduSG3wsePAU=
+github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.37/go.mod h1:zz7dUOhkt56VBdMGoRIec8ZO7C0zKarZQl9qZ06ycE0=
 github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.16 h1:vG6cI1LU8QLpzUXYleYuVyqbpeYghLF3Jj6afcaUCHA=
 github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.16/go.mod h1:R6u0WWZ/GRs0lQaq9B3V+J58XbQ7MslwikigKXfgWNs=
 github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.13 h1:MJyB5NbWAFjfgDnvAcZXk1MHkDh5vpvV3LcqZxZXF/M=