Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/google.golang.org/grpc…
Browse files Browse the repository at this point in the history
…-1.65.0
  • Loading branch information
julienrbrt authored Aug 8, 2024
2 parents 82368d1 + 5312ce8 commit f3075ce
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 44 deletions.
17 changes: 3 additions & 14 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ on:

jobs:
build_and_test:
name: pb-${{ matrix.protobuf_version }}
name: make buildserverall
runs-on: ubuntu-latest
strategy:
matrix:
protobuf_version: [3.19.4]
fail-fast: false
steps:
- name: Checkout branch
Expand All @@ -21,15 +19,6 @@ jobs:
uses: actions/setup-go@v5
with:
go-version: 1.19

- name: Setup protoc
env:
PROTOBUF_VERSION: ${{ matrix.protobuf_version }}
run: ./install-protobuf.sh

- name: Protoc version
run: PATH=$HOME/bin:$PATH protoc --version

- uses: arduino/setup-protoc@v1
- name: Build server allgo version

run: PATH=$HOME/bin:$PATH make buildserverall
run: make buildserverall
2 changes: 1 addition & 1 deletion .github/workflows/lint-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
statuses: write # for amannn/action-semantic-pull-request to mark status of analyzed PR
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v5.5.2
- uses: amannn/action-semantic-pull-request@v5.5.3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/proto-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.31.0
- uses: bufbuild/buf-setup-action@v1.36.0
- uses: bufbuild/buf-push-action@v1
with:
buf_token: ${{ secrets.BUF_TOKEN }}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

## [v1.6.0](https://github.com/cosmos/gogoproto/releases/tag/v1.6.0) - 2024-08-08

- [#142](https://github.com/cosmos/gogoproto/pull/142) Update code generator to make grpc `ServiceDesc` public.

## [v1.5.0](https://github.com/cosmos/gogoproto/releases/tag/v1.5.0) - 2024-06-05

### Improvements
Expand Down
28 changes: 0 additions & 28 deletions install-protobuf.sh

This file was deleted.

1 change: 1 addition & 0 deletions protoc-gen-gogo/grpc/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi
}

// Service descriptor.
g.P("var ", strings.TrimPrefix(serviceDescVar, "_"), " = ", serviceDescVar)
g.P("var ", serviceDescVar, " = ", grpcPkg, ".ServiceDesc {")
g.P("ServiceName: ", strconv.Quote(fullServName), ",")
g.P("HandlerType: (*", serverType, ")(nil),")
Expand Down

0 comments on commit f3075ce

Please sign in to comment.