From e12567c5442c793ea30b08831fa2a6afb96e9493 Mon Sep 17 00:00:00 2001 From: guibescos <59208140+guibescos@users.noreply.github.com> Date: Fri, 6 Jan 2023 16:35:26 +0100 Subject: [PATCH] Move rust-toolchain (#460) * Move rust-toolchain * update tilt * Make CI run everytime * Revert "Make CI run everytime" This reverts commit e5b008a83728a4ae996b00d2697ee0742bca5682. --- tilt-devnet/docker-images/Dockerfile.client | 2 +- tilt-devnet/docker-images/Dockerfile.solana | 2 +- rust-toolchain => wormhole-attester/rust-toolchain | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename rust-toolchain => wormhole-attester/rust-toolchain (100%) diff --git a/tilt-devnet/docker-images/Dockerfile.client b/tilt-devnet/docker-images/Dockerfile.client index 1db6746e..edd754f2 100644 --- a/tilt-devnet/docker-images/Dockerfile.client +++ b/tilt-devnet/docker-images/Dockerfile.client @@ -8,7 +8,7 @@ ARG WORMHOLE_TAG=v2.8.9 RUN apt-get update && apt-get install -yq libudev-dev ncat RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs -ADD rust-toolchain /rust-toolchain +ADD wormhole-attester/rust-toolchain /rust-toolchain WORKDIR /usr/src/bridge-client RUN --mount=type=cache,target=/root/.cache \ diff --git a/tilt-devnet/docker-images/Dockerfile.solana b/tilt-devnet/docker-images/Dockerfile.solana index 9d7ceffe..0b990eb9 100644 --- a/tilt-devnet/docker-images/Dockerfile.solana +++ b/tilt-devnet/docker-images/Dockerfile.solana @@ -19,7 +19,7 @@ RUN sh -c "$(curl -sSfL https://release.solana.com/v1.10.31/install)" ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH" -ADD rust-toolchain /rust-toolchain +ADD wormhole-attester/rust-toolchain /rust-toolchain USER root # Solana does a questionable download at the beginning of a *first* build-bpf call. Trigger and layer-cache it explicitly. diff --git a/rust-toolchain b/wormhole-attester/rust-toolchain similarity index 100% rename from rust-toolchain rename to wormhole-attester/rust-toolchain