fix scripts

AztecProtocol · Oct 10, 2023 · 5a93367 · 5a93367
1 parent 686aa6b
commit 5a93367
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1359,8 +1359,8 @@ workflows:
           <<: *deploy_defaults
       - deploy-npm:
           requires:
-            - yarn-project
-          <<: *defaults
+            - e2e-end
+          <<: *deploy_defaults
 
       - deploy-end:
           requires:

diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh
@@ -6,6 +6,8 @@ extract_repo yarn-project /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
 
 function deploy_package() {
     REPOSITORY=$1
@@ -55,7 +57,11 @@ function deploy_package() {
     fi
 
     # Back to root
-    cd ..
+    if [ "$REPOSITORY" == "../l1-contracts" ]; then
+        cd ../yarn-project
+    else
+        cd ..
+    fi
 }
 
 deploy_package foundation
@@ -77,5 +83,4 @@ deploy_package world-state
 deploy_package sequencer-client
 deploy_package aztec-node
 deploy_package aztec-sandbox
-# this should always be at the last because we do `cd ..` at the end of the deploy_package function
 deploy_package ../l1-contracts
diff --git a/yarn-project/yarn-project-base/Dockerfile b/yarn-project/yarn-project-base/Dockerfile
@@ -73,6 +73,7 @@ COPY --from=circuits /usr/src/circuits/cpp/build-wasm/bin /usr/src/circuits/cpp/
 # Copy ignition download script.
 COPY --from=circuits /usr/src/barretenberg/cpp/srs_db/download_ignition.sh /usr/src/barretenberg/cpp/srs_db/download_ignition.sh
 
-# Generate L1 contract TypeScript artifacts.
+# Copy L1 contracts.
 COPY --from=contracts /usr/src/l1-contracts /usr/src/l1-contracts
+# Generate L1 contract TypeScript artifacts.
 RUN cd l1-artifacts && ./scripts/generate-artifacts.sh