From 1e39ad9fe1e0852ba286e7668aee1f899dd0b96d Mon Sep 17 00:00:00 2001 From: shawn Date: Mon, 21 Aug 2023 15:12:32 -0700 Subject: [PATCH] js-soroban-client local file path installation (#74) * do more yarn specifics when js-soroban-client is local file path, avoids intermittent yarn install failures * remove reference to soroban-xdr-next branch, use main now it's merged --- Dockerfile | 4 ++++ Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f26c53..a5fcf54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,6 +71,10 @@ ADD js-soroban-client /home/tester/js-soroban-client RUN sudo chown -R tester:tester /home/tester RUN yarn install --network-concurrency 1 RUN if echo "$JS_SOROBAN_CLIENT_NPM_VERSION" | grep -q '.*file:.*'; then \ + cd /home/tester/js-soroban-client; \ + yarn cache clean; \ + yarn install --network-concurrency 1; \ + cd /home/tester; \ yarn add ${JS_SOROBAN_CLIENT_NPM_VERSION} --network-concurrency 1; \ else \ yarn add "soroban-client@${JS_SOROBAN_CLIENT_NPM_VERSION}" --network-concurrency 1; \ diff --git a/Makefile b/Makefile index fc8f546..9f7a0fc 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ SOROBAN_CLI_STAGE_IMAGE=stellar/system-test-soroban-cli:dev CORE_GIT_REF=https://github.com/stellar/stellar-core.git\#master SOROBAN_RPC_GIT_REF=https://github.com/stellar/soroban-tools.git\#main SOROBAN_CLI_GIT_REF=https://github.com/stellar/soroban-tools.git\#main -GO_GIT_REF=https://github.com/stellar/go.git\#soroban-xdr-next +GO_GIT_REF=https://github.com/stellar/go.git\#master QUICKSTART_GIT_REF=https://github.com/stellar/quickstart.git\#master # specify the published npm repo version of soroban-client js library, or you can specify gh git ref url as the version also JS_SOROBAN_CLIENT_NPM_VERSION=https://github.com/stellar/js-soroban-client.git\#main