Skip to content

Commit

Permalink
Merge pull request #1057 from cybozu/upgrade-golang20230712
Browse files Browse the repository at this point in the history
Upgrade golang-all to v1.19.11 and 1.20.6
  • Loading branch information
zoetrope authored Jul 13, 2023
2 parents f7e9a41 + 54652c5 commit d23ba71
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion golang-all/golang-1.19-focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu-dev:20.04
LABEL org.opencontainers.image.source "https://github.com/cybozu/neco-containers"

ARG TARGETARCH
ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.19.11

ENV GOARCH=${TARGETARCH}
ENV GOPATH=/go
Expand Down
2 changes: 1 addition & 1 deletion golang-all/golang-1.19-focal/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.10.1_focal
1.19.11.1_focal
6 changes: 3 additions & 3 deletions golang-all/golang-1.19-focal/analyzer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module github.com/cybozu/neco-containers/golang/analyzer

go 1.19

require golang.org/x/tools v0.9.3
require golang.org/x/tools v0.11.0

require (
golang.org/x/mod v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/sys v0.10.0 // indirect
)
14 changes: 7 additions & 7 deletions golang-all/golang-1.19-focal/analyzer/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
2 changes: 1 addition & 1 deletion golang-all/golang-1.19-jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu-dev:22.04
LABEL org.opencontainers.image.source "https://github.com/cybozu/neco-containers"

ARG TARGETARCH
ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.19.11

ENV GOARCH=${TARGETARCH}
ENV GOPATH=/go
Expand Down
2 changes: 1 addition & 1 deletion golang-all/golang-1.19-jammy/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.10.1_jammy
1.19.11.1_jammy
6 changes: 3 additions & 3 deletions golang-all/golang-1.19-jammy/analyzer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module github.com/cybozu/neco-containers/golang/analyzer

go 1.19

require golang.org/x/tools v0.9.3
require golang.org/x/tools v0.11.0

require (
golang.org/x/mod v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/sys v0.10.0 // indirect
)
14 changes: 7 additions & 7 deletions golang-all/golang-1.19-jammy/analyzer/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
2 changes: 1 addition & 1 deletion golang-all/golang-1.20-focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu-dev:20.04
LABEL org.opencontainers.image.source "https://github.com/cybozu/neco-containers"

ARG TARGETARCH
ARG GO_VERSION=1.20.5
ARG GO_VERSION=1.20.6

ENV GOARCH=${TARGETARCH}
ENV GOPATH=/go
Expand Down
2 changes: 1 addition & 1 deletion golang-all/golang-1.20-focal/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20.5.1_focal
1.20.6.1_focal
6 changes: 3 additions & 3 deletions golang-all/golang-1.20-focal/analyzer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module github.com/cybozu/neco-containers/golang/analyzer

go 1.20

require golang.org/x/tools v0.9.3
require golang.org/x/tools v0.11.0

require (
golang.org/x/mod v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/sys v0.10.0 // indirect
)
14 changes: 7 additions & 7 deletions golang-all/golang-1.20-focal/analyzer/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
2 changes: 1 addition & 1 deletion golang-all/golang-1.20-jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu-dev:22.04
LABEL org.opencontainers.image.source "https://github.com/cybozu/neco-containers"

ARG TARGETARCH
ARG GO_VERSION=1.20.5
ARG GO_VERSION=1.20.6

ENV GOARCH=${TARGETARCH}
ENV GOPATH=/go
Expand Down
2 changes: 1 addition & 1 deletion golang-all/golang-1.20-jammy/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20.5.1_jammy
1.20.6.1_jammy
6 changes: 3 additions & 3 deletions golang-all/golang-1.20-jammy/analyzer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module github.com/cybozu/neco-containers/golang/analyzer

go 1.20

require golang.org/x/tools v0.9.3
require golang.org/x/tools v0.11.0

require (
golang.org/x/mod v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/sys v0.10.0 // indirect
)
14 changes: 7 additions & 7 deletions golang-all/golang-1.20-jammy/analyzer/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=

0 comments on commit d23ba71

Please sign in to comment.