Skip to content

Commit

Permalink
use v4 protobuf
Browse files Browse the repository at this point in the history
  • Loading branch information
robodenitro committed Oct 21, 2024
1 parent efd1ee5 commit 46155e2
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 102 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v1
with:
go-version: 1.17.x
go-version: 1.23.x
- name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v3
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This is a small, simple and backwards-compatible [protoc][protoc] wrapper. It en

## Features

It is go-gettable. One can do `go get github.com/sixt/protoc/v3` to install protoc. This enables managing protoc version inside `go.mod` when using the [recommended][tools-go] `tools.go` approach.
It is go-gettable. One can do `go get github.com/sixt/protoc/v4` to install protoc. This enables managing protoc version inside `go.mod` when using the [recommended][tools-go] `tools.go` approach.

It supports proto files hosted in Git repositories. One can specify a local path to the proto file, or a remote URL, e.g. `github.com/myorg/myrepo/foo.proto`.

Expand Down Expand Up @@ -57,14 +57,14 @@ Here's a sample tools.go:
//+build tools
package example

//go:generate go install github.com/sixt/protoc/v3
//go:generate go install github.com/sixt/protoc/v4
//go:generate go install github.com/golang/protobuf/protoc-gen-go
//go:generate go install github.com/micro/protoc-gen-micro

//go:generate protoc --go_out=. foo.proto

import (
_ "github.com/sixt/protoc/v3"
_ "github.com/sixt/protoc/v4"
_ "github.com/golang/protobuf/protoc-gen-go"
_ "github.com/micro/protoc-gen-micro"
)
Expand Down
35 changes: 17 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
module github.com/sixt/protoc/v3
module github.com/sixt/protoc/v4

go 1.18
go 1.23

require (
github.com/go-git/go-git/v5 v5.6.1
github.com/stretchr/testify v1.7.0
github.com/go-git/go-git/v5 v5.12.0
github.com/stretchr/testify v1.9.0
)

require (
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/cloudflare/circl v1.3.2 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.4.1 // indirect
github.com/imdario/mergo v0.3.14 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/tools v0.7.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.26.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 46155e2

Please sign in to comment.