Skip to content

Commit 55ef368

Browse files
bojandbojand
authored
Merge pull request #438 from bojand/update_go_and_net_and_grpc
update go and net and grpc
2 parents 6bc85c8 + 0bed411 commit 55ef368

File tree

7 files changed

+98
-82
lines changed

7 files changed

+98
-82
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ jobs:
3535
runs-on: ubuntu-latest
3636
env:
3737
GO111MODULE: on
38-
GOLANGCI_LINT_VERSION: v1.49.0
38+
GOLANGCI_LINT_VERSION: v1.58.0
3939

4040
steps:
4141
- name: Set up Go
42-
uses: actions/setup-go@v3
42+
uses: actions/setup-go@v5
4343
with:
44-
go-version: 1.19
44+
go-version: 1.22.2
4545
id: go
4646
- name: Check out code
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848
- name: Cache Go modules
49-
uses: actions/cache@v3
49+
uses: actions/cache@v4
5050
id: cache-go-mod
5151
with:
5252
path: ~/go/pkg/mod
@@ -55,7 +55,7 @@ jobs:
5555
${{ runner.os }}-go-
5656
- name: Cache bin directory
5757
id: cache-go-bin
58-
uses: actions/cache@v3
58+
uses: actions/cache@v4
5959
with:
6060
path: ~/go/bin
6161
key: ${{ runner.os }}-go-bin-${{ env.GOLANGCI_LINT_VERSION }}

‎.github/workflows/certs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- name: Refresh certificates
2121
run: openssl req -x509 -out testdata/localhost.crt -keyout testdata/localhost.key -newkey rsa:2048 -nodes -sha256 -subj '/CN=localhost' -extensions EXT -config <( printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth")
2222
- name: Commit to repository

‎.github/workflows/release.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ jobs:
4545
runs-on: ${{ matrix.os }}
4646
steps:
4747
- name: Checkout
48-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4949

5050
- name: Set up Go
51-
uses: actions/setup-go@v3
51+
uses: actions/setup-go@v5
5252
with:
53-
go-version: 1.19
53+
go-version: 1.22.2
5454

5555
- name: Get current time
5656
uses: josStorer/get-current-time@v2.0.2
@@ -193,7 +193,7 @@ jobs:
193193
runs-on: ubuntu-latest
194194
steps:
195195
- name: Checkout
196-
uses: actions/checkout@v3
196+
uses: actions/checkout@v4
197197

198198
- name: Set Versions
199199
uses: actions/github-script@v6

‎Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# syntax=docker.io/docker/dockerfile:1.3-labs@sha256:250ce669e1aeeb5ffb892b18039c3f0801466536cb4210c8eb2638e628859bfd
22

3-
FROM --platform=$BUILDPLATFORM docker.io/library/alpine:3.17 AS alpine
4-
FROM --platform=$BUILDPLATFORM docker.io/library/golang@sha256:403f48633fb5ebd49f9a2b6ad6719f912df23dae44974a0c9445be331e72ff5e AS golang
5-
FROM --platform=$BUILDPLATFORM gcr.io/distroless/base:nonroot@sha256:e406b1da09bc455495417a809efe48a03c48011a89f6eb57b0ab882508021c0d AS distroless
3+
# FROM --platform=$BUILDPLATFORM docker.io/library/alpine:3.19 AS alpine
4+
# FROM --platform=$BUILDPLATFORM docker.io/library/golang@sha256:403f48633fb5ebd49f9a2b6ad6719f912df23dae44974a0c9445be331e72ff5e AS golang
5+
# FROM --platform=$BUILDPLATFORM gcr.io/distroless/base:nonroot@sha256:e406b1da09bc455495417a809efe48a03c48011a89f6eb57b0ab882508021c0d AS distroless
66

7-
8-
FROM golang AS builder
7+
FROM golang:1.22.2 AS builder
98
WORKDIR /app
109
ARG TARGETOS TARGETARCH
1110
ENV CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH
@@ -28,11 +27,11 @@ FROM scratch AS ghz-binary-built
2827
COPY --from=builder /app/dist/ghz /
2928

3029

31-
FROM alpine AS osmap-linux
30+
FROM alpine:3.19 AS osmap-linux
3231
RUN echo linux >/os
33-
FROM alpine AS osmap-macos
32+
FROM alpine:3.19 AS osmap-macos
3433
RUN echo darwin >/os
35-
FROM alpine AS osmap-windows
34+
FROM alpine:3.19 AS osmap-windows
3635
RUN echo windows >/os
3736
FROM osmap-$TARGETOS AS osmap
3837

@@ -58,7 +57,7 @@ EOF
5857
FROM scratch AS ghz-binary
5958
COPY --from=fetcher /app/exe/* /
6059

61-
FROM distroless AS ghz
60+
FROM gcr.io/distroless/base:nonroot AS ghz
6261
COPY --from=ghz-binary --chown=nonroot /ghz /
6362
RUN ["/ghz", "--version"]
6463
ENTRYPOINT ["/ghz"]

‎go.mod‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/dustin/go-humanize v1.0.1
1111
github.com/go-playground/validator v9.31.0+incompatible
1212
github.com/gogo/protobuf v1.3.2
13-
github.com/golang/protobuf v1.5.2
13+
github.com/golang/protobuf v1.5.3
1414
github.com/golangci/golangci-lint v1.43.0
1515
github.com/google/uuid v1.3.0
1616
github.com/jhump/protoreflect v1.15.1
@@ -20,22 +20,23 @@ require (
2020
github.com/labstack/gommon v0.4.0
2121
github.com/mfridman/tparse v0.11.1
2222
github.com/pkg/errors v0.9.1
23-
github.com/prometheus/client_model v0.2.0
23+
github.com/prometheus/client_model v0.3.0
2424
github.com/prometheus/common v0.32.1
2525
github.com/rakyll/statik v0.1.7
26-
github.com/stretchr/testify v1.8.1
26+
github.com/stretchr/testify v1.8.3
2727
go.uber.org/multierr v1.9.0
2828
go.uber.org/zap v1.24.0
29-
golang.org/x/net v0.7.0
29+
golang.org/x/net v0.24.0
3030
golang.org/x/sync v0.1.0
31-
golang.org/x/tools v0.5.0
32-
google.golang.org/grpc v1.45.0
33-
google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743
31+
golang.org/x/tools v0.7.0
32+
google.golang.org/grpc v1.56.3
33+
google.golang.org/protobuf v1.30.0
3434
)
3535

3636
require (
3737
4d63.com/gochecknoglobals v0.1.0 // indirect
38-
cloud.google.com/go/compute v1.5.0 // indirect
38+
cloud.google.com/go/compute v1.19.1 // indirect
39+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
3940
github.com/Antonboom/errname v0.1.6 // indirect
4041
github.com/Antonboom/nilnil v0.1.1 // indirect
4142
github.com/BurntSushi/toml v1.1.0 // indirect
@@ -55,19 +56,19 @@ require (
5556
github.com/breml/bidichk v0.2.3 // indirect
5657
github.com/bufbuild/protocompile v0.4.0 // indirect
5758
github.com/butuzov/ireturn v0.1.1 // indirect
58-
github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
59-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
59+
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
60+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6061
github.com/charithe/durationcheck v0.0.9 // indirect
6162
github.com/charmbracelet/lipgloss v0.4.0 // indirect
6263
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 // indirect
63-
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
64-
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
64+
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
65+
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
6566
github.com/daixiang0/gci v0.2.9 // indirect
6667
github.com/davecgh/go-spew v1.1.1 // indirect
6768
github.com/denis-tingajkin/go-header v0.4.2 // indirect
6869
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
69-
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021 // indirect
70-
github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
70+
github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
71+
github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
7172
github.com/esimonov/ifshort v1.0.4 // indirect
7273
github.com/ettle/strcase v0.1.1 // indirect
7374
github.com/fatih/color v1.13.0 // indirect
@@ -192,14 +193,14 @@ require (
192193
github.com/valyala/fasttemplate v1.2.1 // indirect
193194
github.com/yeya24/promlinter v0.2.0 // indirect
194195
go.uber.org/atomic v1.7.0 // indirect
195-
golang.org/x/crypto v0.3.0 // indirect
196+
golang.org/x/crypto v0.22.0 // indirect
196197
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
197-
golang.org/x/mod v0.7.0 // indirect
198-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
199-
golang.org/x/sys v0.5.0 // indirect
200-
golang.org/x/text v0.7.0 // indirect
198+
golang.org/x/mod v0.9.0 // indirect
199+
golang.org/x/oauth2 v0.7.0 // indirect
200+
golang.org/x/sys v0.19.0 // indirect
201+
golang.org/x/text v0.14.0 // indirect
201202
google.golang.org/appengine v1.6.7 // indirect
202-
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
203+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
203204
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
204205
gopkg.in/ini.v1 v1.66.4 // indirect
205206
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)