Skip to content

Commit

Permalink
Merge pull request #93 from cybozu-go/update-for-latest-k8s
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
takara9 authored Jun 10, 2024
2 parents e0f8fc9 + 09b0170 commit b6b9021
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- name: Cache Tools
id: cache-tools
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
bin
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- name: Set up Docker Buildx
Expand All @@ -47,7 +47,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- run: make test MYSQL_VERSION=${{ matrix.mysql-version }}
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build/moco-agent
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MYSQL_VERSION = 8.0.28
MYSQL_VERSION = 8.0.37

# For Go
GOOS := $(shell go env GOOS)
Expand All @@ -18,7 +18,7 @@ PROTOC_BIN := $(PWD)/bin/protoc
PROTOC_GEN_GO := $(PWD)/bin/protoc-gen-go
PROTOC_GEN_GO_GRPC := $(PWD)/bin/protoc-gen-go-grpc
PROTOC_GEN_DOC := $(PWD)/bin/protoc-gen-doc
PROTOC_VERSION := 25.1
PROTOC_VERSION := 26.1
PROTOC_GEN_GO_VERSION := $(shell awk '/google.golang.org\/protobuf/ {print substr($$2, 2)}' go.mod)
PROTOC_GEN_GO_GRPC_VERSON=1.3.0
PROTOC_GEN_DOC_VERSION=1.5.1
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/cybozu-go/moco-agent

go 1.21
go 1.22.3

require (
github.com/cybozu-go/well v1.11.2
Expand Down
2 changes: 1 addition & 1 deletion proto/agentrpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proto/agentrpc_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b6b9021

Please sign in to comment.