Skip to content

Commit

Permalink
Merge pull request #12 from jinlinGuan/golang-1.23
Browse files Browse the repository at this point in the history
build: Upgrade to go-1.23, Linter1.61.0 and Alpine 3.20
  • Loading branch information
cloudxxx8 authored Oct 4, 2024
2 parents 27c3a43 + f7f97db commit e57816f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
8 changes: 7 additions & 1 deletion Attribution.txt
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,10 @@ golang.org/x/exp (BSD-3) https://cs.opensource.google/go/x/exp
https://cs.opensource.google/go/x/exp/+/master:LICENSE

golang.org/x/time (BSD-3) https://cs.opensource.google/go/x/time
https://cs.opensource.google/go/x/time/+/master:LICENSE
https://cs.opensource.google/go/x/time/+/master:LICENSE

github.com/go-jose/go-jose/v4 (Apache-2.0) https://github.com/go-jose/go-jose
https://github.com/go-jose/go-jose/blob/main/LICENSE

google.golang.org/genproto/googleapis/rpc (Apache-2.0) https://github.com/googleapis/go-genproto
https://github.com/googleapis/go-genproto/blob/main/LICENSE
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#
# Copyright (C) 2023 YIQISOFT
# 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.
Expand All @@ -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
Expand All @@ -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) 2023: YIQISOFT'

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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
go vet ./...
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/edgexfoundry/device-s7

go 1.21
go 1.23

require (
github.com/edgexfoundry/device-sdk-go/v3 v3.1.1
Expand Down

0 comments on commit e57816f

Please sign in to comment.