Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed protobuf from everywhere since libp2p uses quick-protobuf #1757

Merged
merged 4 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 4 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,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]

Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.aarch64-unknown-linux-gnu-clang
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/Dockerfile.x86_64-unknown-linux-gnu-clang
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion ci/macos-install-packages.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/bin/sh

brew install llvm
brew install protobuf
1 change: 0 additions & 1 deletion deployment/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down