Skip to content

Commit f265966

Browse files
authored
Update dependencies & GitHub Actions (#129)
1 parent 8c665be commit f265966

File tree

6 files changed

+162
-143
lines changed

6 files changed

+162
-143
lines changed

.github/workflows/build_and_test.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010
services:
1111
emulator:
12-
image: gcr.io/cloud-spanner-emulator/emulator:1.5.0
12+
image: gcr.io/cloud-spanner-emulator/emulator:1.5.29
1313
ports:
1414
- 9010:9010
1515
- 9020:9020
1616
steps:
17-
- uses: actions/checkout@v2
18-
- uses: actions/setup-go@v2
17+
- uses: actions/checkout@v4.2.2
18+
- uses: actions/setup-go@v5.3.0
1919
with:
20-
go-version: '1.23'
20+
go-version-file: ./go.mod
2121
- run: go version
2222
- run: make setup-emulator
2323
- name: make test with Cloud Spanner Emulator

.github/workflows/release.yaml

+7-9
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,24 @@ on:
55
tags:
66
- '*'
77

8-
env:
9-
GO_VERSION: "~1.23"
10-
118
jobs:
129
goreleaser:
1310
name: Release pre-build binary
1411
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
1514
steps:
1615
- name: Checkout code
17-
uses: actions/checkout@v4
16+
uses: actions/checkout@v4.2.2
1817
with:
1918
fetch-depth: 0
2019
- name: Set up Go
21-
uses: actions/setup-go@v3
20+
uses: actions/setup-go@v5.3.0
2221
with:
23-
go-version: ${{ env.GO_VERSION }}
22+
go-version-file: ./go.mod
2423
- name: Run GoReleaser
25-
uses: goreleaser/goreleaser-action@v4
24+
uses: goreleaser/goreleaser-action@v6.2.1
2625
with:
27-
version: latest
2826
args: release --clean
2927
env:
3028
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -40,7 +38,7 @@ jobs:
4038
IMAGE_NAME: wrench
4139
steps:
4240
- name: Checkout code
43-
uses: actions/checkout@v4
41+
uses: actions/checkout@v4.2.2
4442
with:
4543
fetch-depth: 0
4644
- name: Build image

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23 as build
1+
FROM golang:1.24 as build
22

33
ARG VERSION
44

@@ -10,6 +10,6 @@ RUN CGO_ENABLED=0 go build \
1010
-ldflags "-s -w -X github.com/cloudspannerecosystem/wrench/cmd.version=${VERSION}" \
1111
-o /go/bin/app/wrench
1212

13-
FROM gcr.io/distroless/static-debian11
13+
FROM gcr.io/distroless/static-debian12
1414
COPY --from=build /go/bin/app/wrench /
1515
ENTRYPOINT ["/wrench"]

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPANNER_EMULATOR_HOST_REST := localhost:9020
66
export SPANNER_PROJECT_ID ?= wrench-test-project
77
export SPANNER_INSTANCE_ID ?= wrench-test-instance
88

9-
REGISTRY := mercari/wrench
9+
REGISTRY := ghcr.io/cloudspannerecosystem/wrench
1010

1111
.PHONY: test
1212
test:

go.mod

+47-41
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,67 @@ module github.com/cloudspannerecosystem/wrench
22

33
go 1.23.1
44

5-
toolchain go1.23.2
5+
toolchain go1.24.0
66

77
require (
8-
cloud.google.com/go/spanner v1.64.0
9-
github.com/apstndb/gsqlutils v0.0.0-20241110070457-b8882df29778
10-
github.com/cloudspannerecosystem/memefish v0.0.0-20241106111047-2b2b4b23a1e7
8+
cloud.google.com/go/spanner v1.76.1
9+
github.com/apstndb/gsqlutils v0.0.0-20241220021154-62754cd04acc
10+
github.com/cloudspannerecosystem/memefish v0.4.0
1111
github.com/google/uuid v1.6.0
1212
github.com/hashicorp/go-multierror v1.1.1
13-
github.com/spf13/cobra v1.7.0
14-
google.golang.org/api v0.186.0
15-
google.golang.org/grpc v1.64.0
13+
github.com/spf13/cobra v1.9.1
14+
google.golang.org/api v0.222.0
15+
google.golang.org/grpc v1.70.0
1616
)
1717

1818
require (
19-
cloud.google.com/go v0.115.0 // indirect
20-
cloud.google.com/go/auth v0.6.0 // indirect
21-
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
22-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
23-
cloud.google.com/go/iam v1.1.8 // indirect
24-
cloud.google.com/go/longrunning v0.5.7 // indirect
25-
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect
19+
cel.dev/expr v0.19.0 // indirect
20+
cloud.google.com/go v0.118.2 // indirect
21+
cloud.google.com/go/auth v0.14.1 // indirect
22+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
23+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
24+
cloud.google.com/go/iam v1.4.0 // indirect
25+
cloud.google.com/go/longrunning v0.6.4 // indirect
26+
cloud.google.com/go/monitoring v1.24.0 // indirect
27+
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.2 // indirect
28+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
2629
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
27-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
28-
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 // indirect
29-
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
30-
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
30+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
31+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
32+
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
33+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
3134
github.com/felixge/httpsnoop v1.0.4 // indirect
32-
github.com/go-logr/logr v1.4.1 // indirect
35+
github.com/go-logr/logr v1.4.2 // indirect
3336
github.com/go-logr/stdr v1.2.2 // indirect
3437
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
35-
github.com/golang/protobuf v1.5.4 // indirect
36-
github.com/google/s2a-go v0.1.7 // indirect
37-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
38-
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
38+
github.com/google/s2a-go v0.1.9 // indirect
39+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
40+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
3941
github.com/hashicorp/errwrap v1.1.0 // indirect
4042
github.com/inconshreveable/mousetrap v1.1.0 // indirect
43+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
4144
github.com/samber/lo v1.47.0 // indirect
42-
github.com/spf13/pflag v1.0.5 // indirect
45+
github.com/spf13/pflag v1.0.6 // indirect
4346
go.opencensus.io v0.24.0 // indirect
44-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
45-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
46-
go.opentelemetry.io/otel v1.24.0 // indirect
47-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
48-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
49-
golang.org/x/crypto v0.31.0 // indirect
50-
golang.org/x/net v0.33.0 // indirect
51-
golang.org/x/oauth2 v0.21.0 // indirect
52-
golang.org/x/sync v0.10.0 // indirect
53-
golang.org/x/sys v0.28.0 // indirect
54-
golang.org/x/text v0.21.0 // indirect
55-
golang.org/x/time v0.5.0 // indirect
56-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
57-
google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect
58-
google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
59-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect
60-
google.golang.org/protobuf v1.34.2 // indirect
47+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
48+
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
49+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
50+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
51+
go.opentelemetry.io/otel v1.34.0 // indirect
52+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
53+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
54+
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
55+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
56+
golang.org/x/crypto v0.33.0 // indirect
57+
golang.org/x/net v0.35.0 // indirect
58+
golang.org/x/oauth2 v0.26.0 // indirect
59+
golang.org/x/sync v0.11.0 // indirect
60+
golang.org/x/sys v0.30.0 // indirect
61+
golang.org/x/text v0.22.0 // indirect
62+
golang.org/x/time v0.10.0 // indirect
63+
google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4 // indirect
64+
google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
65+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
66+
google.golang.org/protobuf v1.36.5 // indirect
6167
spheric.cloud/xiter v0.0.0-20240904151420-c999f37a46b2 // indirect
6268
)

0 commit comments

Comments
 (0)