blockworks-foundation
/
pyth-crosschain
mirror of https://github.com/blockworks-foundation/pyth-crosschain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dockerfile.client, Dockerfile.solana: harden caching to cut CI time (#332) 

* Dockerfile.client, Dockerfile.solana: harden caching to cut CI time

This change attempts to add useful items to the docker caching which
should save time downloading crates and by adding path=<full path> and
dropping id=<name> ensure that no Dockerfile cache mismatches occur. I
think the id= param is meant to help group builds that benefit from
common cache, but in case of pyth2wormhole-client/SOL contract builds
it became a competition between the two replacing the other's caches

* Dockerfile.client: remove malformed id= params
This commit is contained in:
Stanisław Drozd 2022-10-20 12:33:18 +02:00 committed by GitHub
parent b784abd144
commit 0a8db01c10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile.client
View File

@ -12,7 +12,8 @@ COPY solana /usr/src/solana
WORKDIR /usr/src/solana/pyth2wormhole WORKDIR /usr/src/solana/pyth2wormhole
RUN --mount=type=cache,target=/root/.cache \ RUN --mount=type=cache,target=/root/.cache \
--mount=type=cache,target=target \ --mount=type=cache,target=/usr/local/cargo/registry,id=cargo_registry \
--mount=type=cache,target=/usr/src/solana/pyth2wormhole/target,id=p2w_cargo_build \
cargo install --version =2.0.12 --locked spl-token-cli --target-dir target cargo install --version =2.0.12 --locked spl-token-cli --target-dir target
@ -23,8 +24,8 @@ ENV EMITTER_ADDRESS="11111111111111111111111111111115"
ENV BRIDGE_ADDRESS="Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o" ENV BRIDGE_ADDRESS="Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"
RUN --mount=type=cache,target=/root/.cache \ RUN --mount=type=cache,target=/root/.cache \
--mount=type=cache,target=/usr/local/cargo/registry,id=cargo_registry \ --mount=type=cache,target=/usr/local/cargo/registry \
--mount=type=cache,target=target,id=cargo_registry \ --mount=type=cache,target=/usr/src/solana/pyth2wormhole/target \
set -xe && \ set -xe && \
cargo install bridge_client --git https://github.com/wormhole-foundation/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local --target-dir target && \ cargo install bridge_client --git https://github.com/wormhole-foundation/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local --target-dir target && \
cargo install token_bridge_client --git https://github.com/wormhole-foundation/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local --target-dir target cargo install token_bridge_client --git https://github.com/wormhole-foundation/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local --target-dir target

6
Dockerfile.solana
View File

@ -46,8 +46,10 @@ ENV BRIDGE_ADDRESS="Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"
WORKDIR /usr/src/bridge/solana WORKDIR /usr/src/bridge/solana
# Build Wormhole Solana programs # Build Wormhole Solana programs
RUN --mount=type=cache,target=../wormhole/solana/target \ RUN --mount=type=cache,target=/usr/src/bridge/wormhole/solana/target \
--mount=type=cache,target=pyth2wormhole/target \ --mount=type=cache,target=/usr/src/bridge/solana/pyth2wormhole/target \
--mount=type=cache,target=/usr/local/cargo/registry \
--mount=type=cache,target=/root/.cache \
cargo build-bpf --manifest-path "../wormhole/solana/bridge/program/Cargo.toml" -- --locked && \ cargo build-bpf --manifest-path "../wormhole/solana/bridge/program/Cargo.toml" -- --locked && \
cargo build-bpf --manifest-path "../wormhole/solana/bridge/cpi_poster/Cargo.toml" -- --locked && \ cargo build-bpf --manifest-path "../wormhole/solana/bridge/cpi_poster/Cargo.toml" -- --locked && \
cargo build-bpf --manifest-path "pyth2wormhole/program/Cargo.toml" -- --locked && \ cargo build-bpf --manifest-path "pyth2wormhole/program/Cargo.toml" -- --locked && \