Skip to content

Commit

Permalink
Merge of #5009
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Sep 6, 2022
2 parents d8cef93 + 4d5ea31 commit b2c8ca2
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 31 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build-crates-individually.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ jobs:
with:
persist-credentials: false

- name: Install last version of Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/continous-integration-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ jobs:
with:
persist-credentials: false

- name: Install last version of Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
Expand Down Expand Up @@ -199,6 +205,12 @@ jobs:
with:
persist-credentials: false

- name: Install last version of Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ jobs:
with:
persist-credentials: false

- name: Install last version of Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install latest beta
uses: actions-rs/toolchain@v1
with:
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ jobs:
with:
persist-credentials: false

- name: Install last version of Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Check workflow permissions
id: check_permissions
uses: scherermichael-oss/[email protected]
Expand Down Expand Up @@ -109,6 +115,12 @@ jobs:
with:
persist-credentials: false

- name: Install last version of Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions-rs/[email protected]
with:
toolchain: stable
Expand All @@ -134,6 +146,12 @@ jobs:
with:
persist-credentials: false

- name: Install last version of Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions-rs/[email protected]
with:
toolchain: stable
Expand Down
43 changes: 16 additions & 27 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions zebrad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ proptest = { version = "0.10.1", optional = true }
proptest-derive = { version = "0.3.0", optional = true }

# test feature tokio-console
console-subscriber = { version = "0.1.6", optional = true }
console-subscriber = { version = "0.1.8", optional = true }

[build-dependencies]
vergen = { version = "7.4.2", default-features = false, features = ["cargo", "git"] }

# test feature lightwalletd-grpc-tests
tonic-build = { version = "0.7.2", optional = true }
tonic-build = { version = "0.8.0", optional = true }

[dev-dependencies]
abscissa_core = { version = "0.5", features = ["testing"] }
Expand All @@ -165,8 +165,8 @@ tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] }
tokio-stream = "0.1.9"

# test feature lightwalletd-grpc-tests
prost = "0.10.4"
tonic = "0.7.2"
prost = "0.11.0"
tonic = "0.8.0"

proptest = "0.10.1"
proptest-derive = "0.3.0"
Expand Down

0 comments on commit b2c8ca2

Please sign in to comment.