Skip to content

Commit

Permalink
Feature/dump block 1 (#329)
Browse files Browse the repository at this point in the history
* Update proto

* Update massa-proto-rs dep

* Update anyhow & serde_json dep

* Fix CI

* Fix CI 2

---------

Co-authored-by: sydhds <sd@massa.net>
  • Loading branch information
sydhds and sydhds committed Apr 30, 2024
1 parent e95066a commit 80352eb
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
push:
branches: [main, staging, trying]
branches: [ main, staging, trying ]
pull_request:
branches: [main, 'testnet_*']
branches: [ main, 'testnet_*' ]
merge_group:
branches: [ main ]

Expand Down Expand Up @@ -46,9 +46,9 @@ jobs:
toolchain: 1.74.1
override: true
- uses: Swatinem/rust-cache@v1
- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
version: '3.x'
version: "23.x"
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rs/cargo@v1
with:
Expand All @@ -70,9 +70,9 @@ jobs:
components: clippy
override: true
- uses: Swatinem/rust-cache@v1
- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
version: '3.x'
version: '23.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rs/clippy-check@v1
with:
Expand Down Expand Up @@ -101,9 +101,9 @@ jobs:
toolchain: 1.74.1
override: true
- uses: Swatinem/rust-cache@v1
- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
version: '3.x'
version: '23.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rs/cargo@v1
with:
Expand Down Expand Up @@ -136,9 +136,9 @@ jobs:
profile: minimal
toolchain: nightly
override: true
- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
version: '3.x'
version: '23.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rs/cargo@v1
with:
Expand Down Expand Up @@ -171,9 +171,9 @@ jobs:
toolchain: 1.74.1
components: rustfmt
override: true
- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
version: '3.x'
version: '23.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rs/cargo@v1
with:
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ chrono = { version = "=0.4", features = ["clock"], default-features = false }
displaydoc = "0.2"
function_name = "0.3"
loupe = "0.1"
massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs.git", rev = "426fd325a55dfcc4033920bed2de075a7e7ad4b7" }
massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs.git", rev = "38950875a7aa406fedc4f0b8336864e5ff290f2c" }
more-asserts = "0.3"
num_enum = "0.7"
parking_lot = "0.12"
Expand Down

0 comments on commit 80352eb

Please sign in to comment.