Skip to content

Commit

Permalink
fix: add directly missing google proto
Browse files Browse the repository at this point in the history
update github actions
  • Loading branch information
rfrerebe authored and rfrerebe-stx committed Oct 26, 2023
1 parent 091b6de commit 549f26d
Show file tree
Hide file tree
Showing 5 changed files with 430 additions and 19 deletions.
25 changes: 14 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- name: Checkout
uses: actions/checkout@v4
- name: Install Protoc
uses: arduino/setup-protoc@v2
with:
profile: minimal
toolchain: stable
- uses: Swatinem/rust-cache@v1
version: "24.x"
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Build
run: cargo build --verbose
deploy:
Expand All @@ -20,12 +22,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
uses: actions/checkout@v4
- name: Install Protoc
uses: arduino/setup-protoc@v2
with:
profile: minimal
toolchain: stable
- uses: Swatinem/rust-cache@v1
version: "24.x"
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Install cargo-edit
run: cargo install cargo-edit
- name: Set VERSION environment variable
Expand All @@ -40,7 +43,7 @@ jobs:
- name: Set version in Cargo.toml
run: cargo set-version ${{ env.VERSION }}
- name: Cargo Login
run: cargo login ${{ secrets.CRATES_IO_API_KEY }}
run: cargo login ${{ secrets.CRATES_IO_API_KEY }}
- name: Create Crates.io package
# add --allow-dirty because Cargo.toml was just modified to set tag version
# add --no-verify because build.rs recomputes protos
Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ description = "Ganymede.cloud rust client."
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
tonic = { version = "0.7", features = ["tls", "prost"] }
prost = "0.10"
prost-types = "0.10"
tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "fs"] }
tonic = { version = "0.10.2", features = ["tls", "prost"] }
prost = "0.12"
prost-types = "0.12"
tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread", "fs"] }

[build-dependencies]
walkdir = "2"
tonic-build = "0.7"
tonic-build = "0.10.2"
4 changes: 1 addition & 3 deletions buf.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
version: v1beta1
version: v1
build:
roots:
- src
lint:
use:
- DEFAULT
ignore:
- google
breaking:
use:
- FILE
31 changes: 31 additions & 0 deletions src/google/api/annotation.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Copyright 2015 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package google.api;

import "google/api/http.proto";
import "google/protobuf/descriptor.proto";

option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
option java_multiple_files = true;
option java_outer_classname = "AnnotationsProto";
option java_package = "com.google.api";
option objc_class_prefix = "GAPI";

extend google.protobuf.MethodOptions {
// See `HttpRule`.
HttpRule http = 72295728;
}
Loading

0 comments on commit 549f26d

Please sign in to comment.