From 1020df80d7af5b9c5c28517669f51af66c9a9efc Mon Sep 17 00:00:00 2001 From: Tim Diekmann Date: Wed, 30 Aug 2023 10:59:14 +0200 Subject: [PATCH] Remove installation of `protoc` --- .github/workflows/rust.yml | 21 --------------------- apps/hash-graph/docker/Dockerfile | 3 --- 2 files changed, 24 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 072be13ea22..a6153922410 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -112,13 +112,6 @@ jobs: with: tool: just@1.13.0,cargo-hack@0.5.26,rust-script@0.23.0,clippy-sarif@0.3.7,sarif-fmt@0.3.7 - # To be removed once https://github.com/open-telemetry/opentelemetry-rust/issues/934 is sorted - - name: Install Protoc - if: matrix.directory == 'apps/hash-graph' - uses: arduino/setup-protoc@v1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Check formatting working-directory: ${{ matrix.directory }} run: just format --check @@ -225,13 +218,6 @@ jobs: with: tool: just@1.13.0,cargo-hack@0.5.26,cargo-nextest@0.9.37 - # To be removed once https://github.com/open-telemetry/opentelemetry-rust/issues/934 is sorted - - name: Install Protoc - if: matrix.directory == 'apps/hash-graph' - uses: arduino/setup-protoc@v1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Install Python if: matrix.directory == 'apps/engine' uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0 @@ -330,13 +316,6 @@ jobs: with: tool: just@1.13.0,cargo-nextest@0.9.37,cargo-llvm-cov@0.5.9 - # To be removed once https://github.com/open-telemetry/opentelemetry-rust/issues/934 is sorted - - name: Install Protoc - if: matrix.directory == 'apps/hash-graph' - uses: arduino/setup-protoc@v1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Run tests working-directory: ${{ matrix.directory }} run: just coverage --lcov --output-path lcov.info diff --git a/apps/hash-graph/docker/Dockerfile b/apps/hash-graph/docker/Dockerfile index 3ccfb102d99..1d213511afe 100644 --- a/apps/hash-graph/docker/Dockerfile +++ b/apps/hash-graph/docker/Dockerfile @@ -45,9 +45,6 @@ WORKDIR /usr/local/src/apps/hash-graph ARG PROFILE=production ARG ENABLE_TEST_SERVER=no -# To be removed once https://github.com/open-telemetry/opentelemetry-rust/issues/934 is sorted -RUN apk add --no-cache make protobuf-dev - RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \ --mount=type=cache,target=/usr/local/cargo/git,sharing=locked \ --mount=type=cache,target=/usr/local/src/apps/hash-graph/target,sharing=locked \