From 446cbaaa53304e4e264224149b102cc1cfa2d8a2 Mon Sep 17 00:00:00 2001 From: cs Date: Tue, 7 Nov 2023 20:08:34 +0000 Subject: [PATCH] near/Dockerfile.build: fix paths in docker builder --- near/Dockerfile.build | 6 +++--- near/Makefile | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/near/Dockerfile.build b/near/Dockerfile.build index c9bb7d2a9..93566523e 100644 --- a/near/Dockerfile.build +++ b/near/Dockerfile.build @@ -6,7 +6,7 @@ RUN ./build-contracts.sh FROM scratch AS near-contracts-export -COPY --from=near-contracts-build /contracts/token-bridge/target/wasm32-unknown-unknown/release/near_token_bridge.wasm near_token_bridge.wasm -COPY --from=near-contracts-build /contracts/wormhole/target/wasm32-unknown-unknown/release/near_wormhole.wasm near_wormhole.wasm -COPY --from=near-contracts-build /contracts/ft/target/wasm32-unknown-unknown/release/near_ft.wasm near_ft.wasm +COPY --from=near-contracts-build /tmp/contracts/token-bridge/target/wasm32-unknown-unknown/release/near_token_bridge.wasm near_token_bridge.wasm +COPY --from=near-contracts-build /tmp/contracts/wormhole/target/wasm32-unknown-unknown/release/near_wormhole.wasm near_wormhole.wasm +COPY --from=near-contracts-build /tmp/contracts/ft/target/wasm32-unknown-unknown/release/near_ft.wasm near_ft.wasm diff --git a/near/Makefile b/near/Makefile index 7141e0868..b1b96abc5 100644 --- a/near/Makefile +++ b/near/Makefile @@ -11,8 +11,13 @@ artifacts: @echo "Building artifacts for near" DOCKER_BUILDKIT=1 docker build -f Dockerfile.build -t near-builder -o type=local,dest=$@ . cd $@ && ls | xargs sha256sum > checksums.txt - ../scripts/contract-upgrade-governance.sh -m token_bridge -c near -a `sha256sum artifacts/near_token_bridge.wasm | sed -e 's/ .*$//'` -o artifacts - ../scripts/contract-upgrade-governance.sh -m core -c near -a `sha256sum artifacts/near_wormhole.wasm | sed -e 's/ .*$//'` -o artifacts > artifacts/README.md + +artifacts/GOVERNANCE.md: artifacts + ../scripts/contract-upgrade-governance.sh --force -m token_bridge -c near -a `sha256sum artifacts/near_token_bridge.wasm | cut -d' ' -f1` -o artifacts + ../scripts/contract-upgrade-governance.sh --force -m core -c near -a `sha256sum artifacts/near_wormhole.wasm | cut -d' ' -f1` -o artifacts > $@ + +.PHONY: governance +governance: artifacts/GOVERNANCE.md build: contracts/ft/target/wasm32-unknown-unknown/release/near_ft.wasm \ contracts/mock-bridge-integration/target/wasm32-unknown-unknown/release/near_mock_bridge_integration.wasm \