From ab35c55fc9136f07ccae1b0116bdc32b3973bb51 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Mon, 13 Mar 2023 19:01:47 +1100 Subject: [PATCH] feat(ci): remove `protoc` installation where possible We only retain it for the test job which runs `cargo semver-checks` which may need to build the rustdoc for the baseline version which still requires `protoc` to be installed until we make the next round of releases. Pull-Request: #3592. --- .github/workflows/cache-factory.yml | 6 ------ .github/workflows/ci.yml | 22 ---------------------- .github/workflows/docs.yml | 4 ---- interop-tests/Dockerfile | 5 ----- 4 files changed, 37 deletions(-) diff --git a/.github/workflows/cache-factory.yml b/.github/workflows/cache-factory.yml index a13bb837..5d2a7779 100644 --- a/.github/workflows/cache-factory.yml +++ b/.github/workflows/cache-factory.yml @@ -33,9 +33,6 @@ jobs: matrix: rust: ${{ fromJSON(needs.gather_msrv_versions.outputs.versions) }} steps: - - name: Install Protoc - run: sudo apt-get install protobuf-compiler - - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@master @@ -55,9 +52,6 @@ jobs: make_stable_rust_cache: runs-on: ubuntu-latest steps: - - name: Install Protoc - run: sudo apt-get install protobuf-compiler - - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70cf891f..cc61927f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,16 +96,6 @@ jobs: os: windows-latest runs-on: ${{ matrix.os }} steps: - - name: Install Protoc - if: ${{ matrix.os != 'ubuntu-latest' }} - uses: arduino/setup-protoc@64c0c85d18e984422218383b81c52f8b077404d3 # v1.1.2 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - - name: Install Protoc - if: ${{ matrix.os == 'ubuntu-latest' }} - run: sudo apt-get install protobuf-compiler - - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable @@ -130,9 +120,6 @@ jobs: - features: "mdns tcp dns tokio" - features: "mdns tcp dns async-std" steps: - - name: Install Protoc - run: sudo apt-get install protobuf-compiler - - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable @@ -150,9 +137,6 @@ jobs: name: Check rustdoc intra-doc links runs-on: ubuntu-latest steps: - - name: Install Protoc - run: sudo apt-get install protobuf-compiler - - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable @@ -176,9 +160,6 @@ jobs: beta ] steps: - - name: Install Protoc - run: sudo apt-get install protobuf-compiler - - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@master @@ -199,9 +180,6 @@ jobs: name: IPFS Integration tests runs-on: ubuntu-latest steps: - - name: Install Protoc - run: sudo apt-get install protobuf-compiler - - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9901be94..470e2f00 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -9,10 +9,6 @@ jobs: name: Build documentation runs-on: ubuntu-latest steps: - - name: Install Protoc - uses: arduino/setup-protoc@64c0c85d18e984422218383b81c52f8b077404d3 # v1.1.2 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Checkout uses: actions/checkout@v3 - name: Install nightly toolchain diff --git a/interop-tests/Dockerfile b/interop-tests/Dockerfile index a9d1428c..129b9813 100644 --- a/interop-tests/Dockerfile +++ b/interop-tests/Dockerfile @@ -1,11 +1,6 @@ # syntax=docker/dockerfile:1.5-labs FROM rust:1.67.0 -# Setup protoc. TODO this breaks reproducibility and uses an old version of protoc. -# In the future protobuf generated files will be checked in, so we can remove this -WORKDIR /protoc-setup -RUN apt-get update && apt-get install -y cmake - # Run with access to the target cache to speed up builds WORKDIR /workspace ADD . .