Skip to content

Commit 58e2371

Browse files
Upgrade tonic and prost (#593)
* Use upstream version of h2 Go back to upstream h2 version as the go-grpc bug is long solved Signed-off-by: Nicolas Belouin <[email protected]> * webhook: Upgrade actix Upgrade actix, actix-web and actix-rt to latest, This solves the following audit issues: - RUSTSEC-2020-0016 - RUSTSEC-2020-0056 - RUSTSEC-2021-0124 - RUSTSEC-2023-0034 Signed-off-by: Nicolas Belouin <[email protected]> * Update all dependencies Opcua crate patch update required because of [opcua#294](locka99/opcua#294) h2 patch needed because of the bad/missing Authority header, using upstream PR branch for this [h2#612](hyperium/h2#612) Signed-off-by: Nicolas Belouin <[email protected]> * Upgrade to 2021 edition This is needed to be able to upgrade prost dependency Signed-off-by: Nicolas Belouin <[email protected]> * Update to rust 1.73.0 Signed-off-by: Nicolas Belouin <[email protected]> * Fix clippy errors/warning with new rust version and edition Signed-off-by: Nicolas Belouin <[email protected]> * Update tonic and prost Signed-off-by: Nicolas Belouin <[email protected]> * Change uri used for patched h2 Signed-off-by: Nicolas Belouin <[email protected]> * Update patch version Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Remove patch for opcua as upstream made release Signed-off-by: Nicolas Belouin <[email protected]> * Also upgrade mockall Signed-off-by: Nicolas Belouin <[email protected]> --------- Signed-off-by: Nicolas Belouin <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent a0a173c commit 58e2371

File tree

30 files changed

+2127
-2159
lines changed

30 files changed

+2127
-2159
lines changed

.github/workflows/check-rust.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@ jobs:
3636
toolchain: 1.73.0
3737
components: clippy, rustfmt
3838
- name: Install Linux requirements
39+
# TODO: When ubuntu-latest gets updated to >= 23.04 replace the wget+unzip with just protobuf-compiler in apt
3940
run: |
4041
apt_dependencies="git curl libssl-dev pkg-config libudev-dev libv4l-dev"
4142
echo "Run apt update and apt install the following dependencies: $apt_dependencies"
4243
sudo apt update
4344
sudo apt install -y $apt_dependencies
45+
echo "Download and install recent enough protobuf compiler"
46+
wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip && sudo unzip protoc-24.3-linux-x86_64.zip bin/protoc -d /usr
4447
- name: Check rust format
4548
run: cargo fmt --all -- --check
4649
- name: Check clippy
@@ -49,10 +52,6 @@ jobs:
4952
run: cargo clippy --all-targets --all-features -- -D warnings -A clippy::derive_partial_eq_without_eq
5053
- name: Run check
5154
run: cargo check
52-
- name: Check for H2 patch not being applied
53-
run: |
54-
cargo check >& h2-check.txt
55-
cat h2-check.txt | grep "h2" | grep "was not used in the crate graph" | wc -l | grep 0
5655
- name: Run tests
5756
run: cargo test
5857
- name: Run tests --ignored

.github/workflows/run-tarpaulin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
persist-credentials: false
3838

3939
- name: Create tarpaulin instance
40-
run: docker create --network host --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin:0.25.1 bash -c "echo 'sleep 600m; echo bye' > /tmp/keep_alive.sh; chmod 777 /tmp/keep_alive.sh; /tmp/keep_alive.sh" > container_id.txt
40+
run: docker create --network host --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin:0.27.1 bash -c "echo 'sleep 600m; echo bye' > /tmp/keep_alive.sh; chmod 777 /tmp/keep_alive.sh; /tmp/keep_alive.sh" > container_id.txt
4141
- name: Start tarpaulin instance
4242
run: docker start $(cat container_id.txt)
4343
- name: Install linux requirement in tarpaulin instance
44-
run: docker exec $(cat container_id.txt) sh -c "echo Run apt update and apt install the following dependencies - git curl libssl-dev pkg-config libudev-dev libv4l-dev ; apt update ; apt install -y git curl libssl-dev pkg-config libudev-dev libv4l-dev"
44+
run: docker exec $(cat container_id.txt) sh -c "echo Run apt update and apt install the following dependencies - git curl libssl-dev pkg-config libudev-dev libv4l-dev protobuf-compiler ; apt update ; apt install -y git curl libssl-dev pkg-config libudev-dev libv4l-dev protobuf-compiler"
4545
- name: Install desired rust version
4646
run: docker exec $(cat container_id.txt) sh -c "rustup install $CARGO_VERSION"
4747
- name: Tell cargo to use desired rust version

0 commit comments

Comments
 (0)