From 4ce3ec19bff0e913e772d45a190547e583cde630 Mon Sep 17 00:00:00 2001 From: xgreenx Date: Fri, 15 Mar 2024 21:57:49 +0100 Subject: [PATCH 1/3] Removed `protobuf` from everywhere since `libp2p` uses `quick-protobuf` --- .github/workflows/ci.yml | 17 ++++------------- README.md | 5 ++--- ci/Dockerfile.aarch64-unknown-linux-gnu-clang | 2 +- ci/Dockerfile.x86_64-unknown-linux-gnu-clang | 2 +- ci/macos-install-packages.sh | 1 - deployment/Dockerfile | 1 - 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8199344ab0..0de6f63944 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,9 +6,9 @@ on: branches: - master pull_request: - types: [opened, synchronize, reopened, labeled, unlabeled] + types: [ opened, synchronize, reopened, labeled, unlabeled ] release: - types: [published] + types: [ published ] concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -40,7 +40,7 @@ jobs: with: toolchain: ${{ env.NIGHTLY_RUST_VERSION }} components: rustfmt - + - name: Rustfmt check run: cargo +${{ env.NIGHTLY_RUST_VERSION }} fmt --all -- --check @@ -161,10 +161,6 @@ jobs: uses: davidB/rust-cargo-make@v1 with: version: "0.36.4" - - name: Install Protoc - run: | - sudo apt-get update - sudo apt-get install protobuf-compiler - uses: rui314/setup-mold@v1 - uses: buildjet/cache@v3 with: @@ -246,11 +242,6 @@ jobs: with: toolchain: ${{ env.RUST_VERSION }} - - name: Install Protoc - run: | - sudo apt-get update - sudo apt-get install protobuf-compiler - - name: Publish crate uses: xgreenx/publish-crates@v1 with: @@ -579,7 +570,7 @@ jobs: # Deploy Fuel Core Ephemeral Developer Environment deploy-eph-env: - if: startsWith(github.head_ref, 'preview/') + if: startsWith(github.head_ref, 'preview/') needs: - publish-docker-image runs-on: buildjet-4vcpu-ubuntu-2204 diff --git a/README.md b/README.md index 3ba43247d4..f30d2b61f0 100644 --- a/README.md +++ b/README.md @@ -24,20 +24,19 @@ There are several system requirements including clang. ```bash brew update brew install cmake -brew install protobuf ``` #### Debian ```bash apt update -apt install -y cmake pkg-config build-essential git clang libclang-dev protobuf-compiler +apt install -y cmake pkg-config build-essential git clang libclang-dev ``` #### Arch ```bash -pacman -Syu --needed --noconfirm cmake gcc pkgconf git clang protobuf-compiler +pacman -Syu --needed --noconfirm cmake gcc pkgconf git clang ``` ### Compiling diff --git a/ci/Dockerfile.aarch64-unknown-linux-gnu-clang b/ci/Dockerfile.aarch64-unknown-linux-gnu-clang index f09d956116..7da3d53f71 100644 --- a/ci/Dockerfile.aarch64-unknown-linux-gnu-clang +++ b/ci/Dockerfile.aarch64-unknown-linux-gnu-clang @@ -4,4 +4,4 @@ ENV PKG_CONFIG_ALLOW_CROSS="true" RUN dpkg --add-architecture arm64 && \ apt-get update && \ - apt-get install --assume-yes clang-8 libclang-8-dev binutils-aarch64-linux-gnu protobuf-compiler zlib1g-dev:arm64 + apt-get install --assume-yes clang-8 libclang-8-dev binutils-aarch64-linux-gnu zlib1g-dev:arm64 diff --git a/ci/Dockerfile.x86_64-unknown-linux-gnu-clang b/ci/Dockerfile.x86_64-unknown-linux-gnu-clang index 7327c9f345..eabc1c8d7d 100644 --- a/ci/Dockerfile.x86_64-unknown-linux-gnu-clang +++ b/ci/Dockerfile.x86_64-unknown-linux-gnu-clang @@ -1,4 +1,4 @@ FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main@sha256:bf0cd3027befe882feb5a2b4040dc6dbdcb799b25c5338342a03163cea43da1b RUN apt-get update && \ - apt-get install --assume-yes clang libclang-dev binutils-aarch64-linux-gnu protobuf-compiler + apt-get install --assume-yes clang libclang-dev binutils-aarch64-linux-gnu diff --git a/ci/macos-install-packages.sh b/ci/macos-install-packages.sh index 1ebd57e044..df57a86cac 100755 --- a/ci/macos-install-packages.sh +++ b/ci/macos-install-packages.sh @@ -1,4 +1,3 @@ #!/bin/sh brew install llvm -brew install protobuf diff --git a/deployment/Dockerfile b/deployment/Dockerfile index 73843f3a54..bd5afe23e4 100644 --- a/deployment/Dockerfile +++ b/deployment/Dockerfile @@ -14,7 +14,6 @@ RUN apt-get update && \ lld \ clang \ libclang-dev \ - protobuf-compiler \ && xx-apt-get update \ && xx-apt-get install -y libc6-dev g++ binutils \ && apt-get clean \ From 12bf86be8e8f56eef96be98a4b67bcdea043e45a Mon Sep 17 00:00:00 2001 From: xgreenx Date: Fri, 15 Mar 2024 22:00:46 +0100 Subject: [PATCH 2/3] Updated CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd9152bd03..4345d87c1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,9 @@ Description of the upcoming release here. Using uniform-sized batches may result in batches containing items from multiple contracts. Optimal performance can presumably be achieved by selecting a batch size that typically encompasses an entire contract's state or balance, allowing for immediate initialization of relevant Merkle trees. +### Removed + +- [#1757](https://github.com/FuelLabs/fuel-core/pull/1757): Removed `protobuf` from everywhere since `libp2p` uses `quick-protobuf`. ## [Version 0.23.0] From 1e3bb1bf6aa98a7759d44b42b91e38b7c4f8a941 Mon Sep 17 00:00:00 2001 From: Brandon Vrooman Date: Sun, 17 Mar 2024 17:42:55 -0400 Subject: [PATCH 3/3] Remove reference to `protoc` from `CONTRIBUTING.md` --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2bcf94db71..92ab99b7ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,6 @@ To build Fuel Core you'll need to at least have the following installed: - `git` - version control - [`rustup`](https://rustup.rs/) - Rust installer and toolchain manager - [`clang`](http://releases.llvm.org/download.html) - Used to build system libraries (required for rocksdb). -- [`protoc`](https://grpc.io/docs/protoc-installation/) - Used to compile Protocol Buffer files (required by libp2p). See the [README.md](README.md#system-requirements) for platform specific setup steps.