From a8cf67b0349d057d757aede9d945aa3195fb7e68 Mon Sep 17 00:00:00 2001 From: sydhds Date: Mon, 29 Apr 2024 11:35:39 +0200 Subject: [PATCH 1/5] Update proto --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7f652ec..80c81b95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -938,7 +938,7 @@ dependencies = [ [[package]] name = "massa-proto-rs" version = "0.1.0" -source = "git+https://github.com/massalabs/massa-proto-rs.git?rev=426fd325a55dfcc4033920bed2de075a7e7ad4b7#426fd325a55dfcc4033920bed2de075a7e7ad4b7" +source = "git+https://github.com/massalabs/massa-proto-rs.git?rev=4a7efd42005eeb6ed2104d2a9631729435a0a891#4a7efd42005eeb6ed2104d2a9631729435a0a891" dependencies = [ "glob", "prost", diff --git a/Cargo.toml b/Cargo.toml index f70fde4b..f7782ca2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 = "4a7efd42005eeb6ed2104d2a9631729435a0a891" } more-asserts = "0.3" num_enum = "0.7" parking_lot = "0.12" From 298f75fb1a05b37e25f7d2506161695bdcad4a82 Mon Sep 17 00:00:00 2001 From: sydhds Date: Tue, 30 Apr 2024 14:45:57 +0200 Subject: [PATCH 2/5] Update massa-proto-rs dep --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80c81b95..a3cf7c18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -938,7 +938,7 @@ dependencies = [ [[package]] name = "massa-proto-rs" version = "0.1.0" -source = "git+https://github.com/massalabs/massa-proto-rs.git?rev=4a7efd42005eeb6ed2104d2a9631729435a0a891#4a7efd42005eeb6ed2104d2a9631729435a0a891" +source = "git+https://github.com/massalabs/massa-proto-rs.git?rev=38950875a7aa406fedc4f0b8336864e5ff290f2c#38950875a7aa406fedc4f0b8336864e5ff290f2c" dependencies = [ "glob", "prost", diff --git a/Cargo.toml b/Cargo.toml index f7782ca2..24950cbe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 = "4a7efd42005eeb6ed2104d2a9631729435a0a891" } +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" From 785d1b9537a00ef7379c026c7bb22f6c700c6f78 Mon Sep 17 00:00:00 2001 From: sydhds Date: Tue, 30 Apr 2024 14:47:23 +0200 Subject: [PATCH 3/5] Update anyhow & serde_json dep --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a3cf7c18..edd292b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arrayvec" @@ -1541,9 +1541,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" dependencies = [ "itoa", "ryu", From d136afdb831bdae0f14851f2c0c0361a1caac101 Mon Sep 17 00:00:00 2001 From: sydhds Date: Tue, 30 Apr 2024 14:55:29 +0200 Subject: [PATCH 4/5] Fix CI --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 378bc3c1..87d0202c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 ] @@ -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: From cfb825225a974d002ece9a656cd90ab3d4134b83 Mon Sep 17 00:00:00 2001 From: sydhds Date: Tue, 30 Apr 2024 15:01:22 +0200 Subject: [PATCH 5/5] Fix CI 2 --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87d0202c..d9637dff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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: @@ -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: @@ -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: