Skip to content

Commit 549f26d

Browse files
rfrereberfrerebe-stx
authored andcommitted
fix: add directly missing google proto
update github actions
1 parent 091b6de commit 549f26d

File tree

5 files changed

+430
-19
lines changed

5 files changed

+430
-19
lines changed

.github/workflows/build.yml

+14-11
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ jobs:
55
build:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v2
9-
- uses: actions-rs/toolchain@v1
8+
- name: Checkout
9+
uses: actions/checkout@v4
10+
- name: Install Protoc
11+
uses: arduino/setup-protoc@v2
1012
with:
11-
profile: minimal
12-
toolchain: stable
13-
- uses: Swatinem/rust-cache@v1
13+
version: "24.x"
14+
- name: Install Rust
15+
uses: dtolnay/rust-toolchain@stable
1416
- name: Build
1517
run: cargo build --verbose
1618
deploy:
@@ -20,12 +22,13 @@ jobs:
2022
runs-on: ubuntu-latest
2123
steps:
2224
- name: Checkout
23-
uses: actions/checkout@v2
24-
- uses: actions-rs/toolchain@v1
25+
uses: actions/checkout@v4
26+
- name: Install Protoc
27+
uses: arduino/setup-protoc@v2
2528
with:
26-
profile: minimal
27-
toolchain: stable
28-
- uses: Swatinem/rust-cache@v1
29+
version: "24.x"
30+
- name: Install Rust
31+
uses: dtolnay/rust-toolchain@stable
2932
- name: Install cargo-edit
3033
run: cargo install cargo-edit
3134
- name: Set VERSION environment variable
@@ -40,7 +43,7 @@ jobs:
4043
- name: Set version in Cargo.toml
4144
run: cargo set-version ${{ env.VERSION }}
4245
- name: Cargo Login
43-
run: cargo login ${{ secrets.CRATES_IO_API_KEY }}
46+
run: cargo login ${{ secrets.CRATES_IO_API_KEY }}
4447
- name: Create Crates.io package
4548
# add --allow-dirty because Cargo.toml was just modified to set tag version
4649
# add --no-verify because build.rs recomputes protos

Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ description = "Ganymede.cloud rust client."
1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

1414
[dependencies]
15-
tonic = { version = "0.7", features = ["tls", "prost"] }
16-
prost = "0.10"
17-
prost-types = "0.10"
18-
tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "fs"] }
15+
tonic = { version = "0.10.2", features = ["tls", "prost"] }
16+
prost = "0.12"
17+
prost-types = "0.12"
18+
tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread", "fs"] }
1919

2020
[build-dependencies]
2121
walkdir = "2"
22-
tonic-build = "0.7"
22+
tonic-build = "0.10.2"

buf.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
version: v1beta1
1+
version: v1
22
build:
33
roots:
44
- src
55
lint:
66
use:
77
- DEFAULT
8-
ignore:
9-
- google
108
breaking:
119
use:
1210
- FILE

src/google/api/annotation.proto

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright 2015 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
syntax = "proto3";
16+
17+
package google.api;
18+
19+
import "google/api/http.proto";
20+
import "google/protobuf/descriptor.proto";
21+
22+
option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
23+
option java_multiple_files = true;
24+
option java_outer_classname = "AnnotationsProto";
25+
option java_package = "com.google.api";
26+
option objc_class_prefix = "GAPI";
27+
28+
extend google.protobuf.MethodOptions {
29+
// See `HttpRule`.
30+
HttpRule http = 72295728;
31+
}

0 commit comments

Comments
 (0)