diff --git a/build-system/scripts/extract_repo b/build-system/scripts/extract_repo index ecae3c84152..c2579b5a46f 100755 --- a/build-system/scripts/extract_repo +++ b/build-system/scripts/extract_repo @@ -16,7 +16,7 @@ TEMP_CONTAINER=$(docker create $IMAGE_COMMIT_URI) echo "Extracting $EXTRACT_FROM from $REPOSITORY to $EXTRACT_TO..." mkdir -p $EXTRACT_TO docker cp $TEMP_CONTAINER:$EXTRACT_FROM $EXTRACT_TO -docker rm -v $TEMP_CONTAINER > /dev/null +docker rm -v $TEMP_CONTAINER >/dev/null echo "Extracted contents:" ls -al $EXTRACT_TO diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh index 7947609bc05..04f6ab46841 100755 --- a/yarn-project/deploy_npm.sh +++ b/yarn-project/deploy_npm.sh @@ -7,12 +7,10 @@ if [ -z "$COMMIT_TAG" ]; then exit 0 fi -extract_repo yarn-project /usr/src project +extract_repo yarn-project-prod /usr/src project cd project/src/yarn-project echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >.npmrc -# also copy npcrc into the l1-contracts directory -cp .npmrc ../l1-contracts # This is to be used with the 'canary' tag for testing, and then 'latest' for making it public DIST_TAG=${1:-"latest"} @@ -70,12 +68,8 @@ function deploy_package() { fi fi - # Back to root - if [ "$REPOSITORY" == "../l1-contracts" ]; then - cd ../yarn-project - else - cd .. - fi + # Return to root + cd .. } # New packages here should be added after the last package that they depend on @@ -98,4 +92,4 @@ deploy_package p2p deploy_package world-state deploy_package sequencer-client deploy_package aztec-node -deploy_package aztec-sandbox \ No newline at end of file +deploy_package aztec-sandbox